summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-08-15 23:13:08 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-08-15 23:13:08 +0000
commitdb0bc3759f980cdc899215e89804bd0e2f2369d8 (patch)
tree1940da755573d9979784e03a77fdbfa167498429
parent3a5ca0b5fae2904ddbce7f3f19d23a8eafbcfc25 (diff)
remove extra \n in {warn,err}{,x} calls
-rw-r--r--gnu/usr.bin/ld/ld.c4
-rw-r--r--gnu/usr.bin/ld/ns32k/md.c4
-rw-r--r--gnu/usr.bin/ld/rtld/rtld.c6
-rw-r--r--regress/lib/libc/malloc/malloc_errno/malloc_errno.c6
-rw-r--r--usr.bin/ftp/fetch.c8
-rw-r--r--usr.sbin/syslogd/privsep.c4
6 files changed, 16 insertions, 16 deletions
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index 9c4afb2300c..20bca5004db 100644
--- a/gnu/usr.bin/ld/ld.c
+++ b/gnu/usr.bin/ld/ld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.c,v 1.29 2003/04/16 02:15:10 deraadt Exp $ */
+/* $OpenBSD: ld.c,v 1.30 2003/08/15 23:13:06 deraadt Exp $ */
/* $NetBSD: ld.c,v 1.52 1998/02/20 03:12:51 jonathan Exp $ */
/*-
@@ -2630,7 +2630,7 @@ write_header(void)
flags = 0;
if (oldmagic && (flags & EX_DPMASK))
- warnx("Cannot set flag in old magic headers\n");
+ warnx("Cannot set flag in old magic headers");
N_SET_FLAG (outheader, flags);
diff --git a/gnu/usr.bin/ld/ns32k/md.c b/gnu/usr.bin/ld/ns32k/md.c
index 4dd8626df66..137d1e6cba0 100644
--- a/gnu/usr.bin/ld/ns32k/md.c
+++ b/gnu/usr.bin/ld/ns32k/md.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md.c,v 1.5 2002/07/19 19:28:12 marc Exp $ */
+/* $OpenBSD: md.c,v 1.6 2003/08/15 23:13:06 deraadt Exp $ */
/* $NetBSD: md.c,v 1.6 1994/11/30 06:20:42 phil Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
@@ -191,7 +191,7 @@ get_disp(unsigned char *addr, int n)
Ivalue = (Ivalue << 8) | *addr;
break;
default:
- errx(1, "get_disp: invalid argument %d\n", n);
+ errx(1, "get_disp: invalid argument %d", n);
}
return Ivalue;
}
diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c
index 22dd67b1013..c2e20f8d6f8 100644
--- a/gnu/usr.bin/ld/rtld/rtld.c
+++ b/gnu/usr.bin/ld/rtld/rtld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtld.c,v 1.37 2003/05/08 16:30:52 millert Exp $ */
+/* $OpenBSD: rtld.c,v 1.38 2003/08/15 23:13:06 deraadt Exp $ */
/* $NetBSD: rtld.c,v 1.43 1996/01/14 00:35:17 pk Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
@@ -1305,11 +1305,11 @@ findhint(char *name, int major, int minor, char *prefered_path)
while (1) {
/* Sanity check */
if (bp->hi_namex >= hheader->hh_strtab_sz) {
- warnx("Bad name index: %#x\n", bp->hi_namex);
+ warnx("Bad name index: %#x", bp->hi_namex);
break;
}
if (bp->hi_pathx >= hheader->hh_strtab_sz) {
- warnx("Bad path index: %#x\n", bp->hi_pathx);
+ warnx("Bad path index: %#x", bp->hi_pathx);
break;
}
diff --git a/regress/lib/libc/malloc/malloc_errno/malloc_errno.c b/regress/lib/libc/malloc/malloc_errno/malloc_errno.c
index 1232dd660d8..7f77544665b 100644
--- a/regress/lib/libc/malloc/malloc_errno/malloc_errno.c
+++ b/regress/lib/libc/malloc/malloc_errno/malloc_errno.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc_errno.c,v 1.2 2003/07/31 21:48:03 deraadt Exp $ */
+/* $OpenBSD: malloc_errno.c,v 1.3 2003/08/15 23:13:07 deraadt Exp $ */
/*
* Public domain. 2003, Otto Moerbeek
*/
@@ -16,11 +16,11 @@ testerrno(size_t sz)
p = malloc(sz);
if (p == NULL && errno != ENOMEM)
- errx(1, "fail: %lx %p %d\n", (unsigned long)sz, p, errno);
+ errx(1, "fail: %lx %p %d", (unsigned long)sz, p, errno);
/* if alloc succeeded, test if errno did not change */
if (p != NULL && errno != -1)
- errx(1, "fail: %lx %p %d\n", (unsigned long)sz, p, errno);
+ errx(1, "fail: %lx %p %d", (unsigned long)sz, p, errno);
free(p);
}
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index d988fc2e13d..0797f47c8c6 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fetch.c,v 1.46 2003/04/05 17:19:47 deraadt Exp $ */
+/* $OpenBSD: fetch.c,v 1.47 2003/08/15 23:13:06 deraadt Exp $ */
/* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */
/*-
@@ -38,7 +38,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: fetch.c,v 1.46 2003/04/05 17:19:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: fetch.c,v 1.47 2003/08/15 23:13:06 deraadt Exp $";
#endif /* not lint */
/*
@@ -233,7 +233,7 @@ url_get(origline, proxyenv, outfile)
progressmeter(-1);
if ((buf = malloc(4096)) == NULL)
- errx(1, "Can't allocate memory for transfer buffer\n");
+ errx(1, "Can't allocate memory for transfer buffer");
/* Finally, suck down the file. */
i = 0;
@@ -497,7 +497,7 @@ again:
/* Finally, suck down the file. */
if ((buf = malloc(4096)) == NULL)
- errx(1, "Can't allocate memory for transfer buffer\n");
+ errx(1, "Can't allocate memory for transfer buffer");
i = 0;
while ((len = fread(buf, sizeof(char), 4096, fin)) > 0) {
bytes += len;
diff --git a/usr.sbin/syslogd/privsep.c b/usr.sbin/syslogd/privsep.c
index e70e8d367d6..c804086b4cc 100644
--- a/usr.sbin/syslogd/privsep.c
+++ b/usr.sbin/syslogd/privsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: privsep.c,v 1.4 2003/08/01 14:04:35 avsm Exp $ */
+/* $OpenBSD: privsep.c,v 1.5 2003/08/15 23:13:06 deraadt Exp $ */
/*
* Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org>
@@ -402,7 +402,7 @@ priv_open_log(const char *log)
int cmd, fd;
if (priv_fd < 0)
- errx(1, "%s: called from privileged child\n", __func__);
+ errx(1, "%s: called from privileged child", __func__);
if (strlcpy(path, log, sizeof path) >= sizeof(path))
return -1;