diff options
| author | Jason Peel <jsyn@cvs.openbsd.org> | 2002-06-11 06:16:37 +0000 |
|---|---|---|
| committer | Jason Peel <jsyn@cvs.openbsd.org> | 2002-06-11 06:16:37 +0000 |
| commit | f1bb7fb5cfe9822f50143a03473f49e825e704bc (patch) | |
| tree | b52183f48c7c26eefd4e775d5d3961c0966d3ccd /usr.bin | |
| parent | ea445c9a491356bc5908d76271fddc05137a4a3c (diff) | |
kill err(3) newlines; ok miod@, deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/sed/compile.c | 8 | ||||
| -rw-r--r-- | usr.bin/sed/process.c | 12 | ||||
| -rw-r--r-- | usr.bin/usbhidaction/usbhidaction.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c index e47135b6ae7..b14b392e24d 100644 --- a/usr.bin/sed/compile.c +++ b/usr.bin/sed/compile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compile.c,v 1.11 2002/02/16 21:27:52 millert Exp $ */ +/* $OpenBSD: compile.c,v 1.12 2002/06/11 06:16:36 jsyn Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -39,7 +39,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95"; */ -static char *rcsid = "$OpenBSD: compile.c,v 1.11 2002/02/16 21:27:52 millert Exp $"; +static char *rcsid = "$OpenBSD: compile.c,v 1.12 2002/06/11 06:16:36 jsyn Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -270,7 +270,7 @@ nonsel: /* Now parse the command */ else if ((cmd->u.fd = open(p, O_WRONLY|O_APPEND|O_CREAT|O_TRUNC, DEFFILEMODE)) == -1) - err(FATAL, "%s: %s\n", p, strerror(errno)); + err(FATAL, "%s: %s", p, strerror(errno)); break; case RFILE: /* r */ p++; @@ -560,7 +560,7 @@ compile_flags(p, s) if (!aflag && (s->wfd = open(wfile, O_WRONLY|O_APPEND|O_CREAT|O_TRUNC, DEFFILEMODE)) == -1) - err(FATAL, "%s: %s\n", wfile, strerror(errno)); + err(FATAL, "%s: %s", wfile, strerror(errno)); return (p); default: err(COMPILE, diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index af12c21ac8c..4cdbf0cefef 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process.c,v 1.8 2002/04/15 21:47:45 millert Exp $ */ +/* $OpenBSD: process.c,v 1.9 2002/06/11 06:16:36 jsyn Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -39,7 +39,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)process.c 8.1 (Berkeley) 6/6/93"; */ -static char *rcsid = "$OpenBSD: process.c,v 1.8 2002/04/15 21:47:45 millert Exp $"; +static char *rcsid = "$OpenBSD: process.c,v 1.9 2002/06/11 06:16:36 jsyn Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -227,10 +227,10 @@ redirect: if (cp->u.fd == -1 && (cp->u.fd = open(cp->t, O_WRONLY|O_APPEND|O_CREAT|O_TRUNC, DEFFILEMODE)) == -1) - err(FATAL, "%s: %s\n", + err(FATAL, "%s: %s", cp->t, strerror(errno)); if (write(cp->u.fd, ps, psl) != psl) - err(FATAL, "%s: %s\n", + err(FATAL, "%s: %s", cp->t, strerror(errno)); break; case 'x': @@ -414,9 +414,9 @@ substitute(cp) if (cp->u.s->wfile && !pd) { if (cp->u.s->wfd == -1 && (cp->u.s->wfd = open(cp->u.s->wfile, O_WRONLY|O_APPEND|O_CREAT|O_TRUNC, DEFFILEMODE)) == -1) - err(FATAL, "%s: %s\n", cp->u.s->wfile, strerror(errno)); + err(FATAL, "%s: %s", cp->u.s->wfile, strerror(errno)); if (write(cp->u.s->wfd, ps, psl) != psl) - err(FATAL, "%s: %s\n", cp->u.s->wfile, strerror(errno)); + err(FATAL, "%s: %s", cp->u.s->wfile, strerror(errno)); } return (1); } diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c index 7b218f5e49f..e7783fc2055 100644 --- a/usr.bin/usbhidaction/usbhidaction.c +++ b/usr.bin/usbhidaction/usbhidaction.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbhidaction.c,v 1.1 2002/05/10 00:09:17 nate Exp $ */ +/* $OpenBSD: usbhidaction.c,v 1.2 2002/06/11 06:16:36 jsyn Exp $ */ /* $NetBSD: usbhidaction.c,v 1.7 2002/01/18 14:38:59 augustss Exp $ */ /* @@ -142,7 +142,7 @@ main(int argc, char **argv) reportid = -1; repd = hid_get_report_desc(fd); if (repd == NULL) - err(1, "hid_get_report_desc() failed\n"); + err(1, "hid_get_report_desc() failed"); commands = parse_conf(conf, repd, reportid, ignore); @@ -348,7 +348,7 @@ parse_conf(const char *conf, report_desc_t repd, int reportid, int ignore) } if (ignore) { if (verbose) - warnx("ignore item '%s'\n", name); + warnx("ignore item '%s'", name); continue; } if (isdemon) { |