===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/usbhidaction/usbhidaction.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/usbhidaction/usbhidaction.c	2004/09/14 22:59:26	1.5
--- src/usr.bin/usbhidaction/usbhidaction.c	2004/10/27 18:16:57	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: usbhidaction.c,v 1.5 2004/09/14 22:59:26 deraadt Exp $ */
  /*      $NetBSD: usbhidaction.c,v 1.7 2002/01/18 14:38:59 augustss Exp $ */
  
  /*
--- 1,4 ----
! /*	$OpenBSD: usbhidaction.c,v 1.6 2004/10/27 18:16:57 jaredy Exp $ */
  /*      $NetBSD: usbhidaction.c,v 1.7 2002/01/18 14:38:59 augustss Exp $ */
  
  /*
***************
*** 261,267 ****
  				freecommands(cmds);
  				return (NULL);
  			} else {
! 				errx(1, "config file `%s', line %d,"
  				    ", syntax error: %s", conf, line, buf);
  			}
  		}
--- 261,267 ----
  				freecommands(cmds);
  				return (NULL);
  			} else {
! 				errx(1, "config file `%s', line %d"
  				    ", syntax error: %s", conf, line, buf);
  			}
  		}
***************
*** 281,293 ****
  				if (isdemon) {
  					syslog(LOG_WARNING,
  					    "config file `%s', line %d, "
! 					    "bad value: %s\n",
  					    conf, line, value);
  					freecommands(cmds);
  					return (NULL);
  				} else {
  					errx(1, "config file `%s', line %d, "
! 					    "bad value: %s\n",
  					    conf, line, value);
  				}
  			}
--- 281,293 ----
  				if (isdemon) {
  					syslog(LOG_WARNING,
  					    "config file `%s', line %d, "
! 					    "bad value: %s",
  					    conf, line, value);
  					freecommands(cmds);
  					return (NULL);
  				} else {
  					errx(1, "config file `%s', line %d, "
! 					    "bad value: %s",
  					    conf, line, value);
  				}
  			}
***************
*** 354,365 ****
  		}
  		if (isdemon) {
  			syslog(LOG_WARNING, "config file `%s', line %d, HID "
! 			    "item not found: `%s'\n", conf, line, name);
  			freecommands(cmds);
  			return (NULL);
  		} else {
  			errx(1, "config file `%s', line %d, HID item "
! 			    "not found: `%s'\n", conf, line, name);
  		}
  
  	foundhid:
--- 354,365 ----
  		}
  		if (isdemon) {
  			syslog(LOG_WARNING, "config file `%s', line %d, HID "
! 			    "item not found: `%s'", conf, line, name);
  			freecommands(cmds);
  			return (NULL);
  		} else {
  			errx(1, "config file `%s', line %d, HID item "
! 			    "not found: `%s'", conf, line, name);
  		}
  
  	foundhid: