Kill extra newline in err()/warn().

7 files changed, 20 insertions, 17 deletions

diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 12c8deffe61..e635bd11ec7 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: apm.c,v 1.2 1997/09/12 04:07:14 millert Exp $	*/
+
 /*
  *  Copyright (c) 1996 John T. Kohl
  *  All rights reserved.
@@ -87,7 +89,7 @@ send_command(int fd,
 
     if (send(fd, cmd, sizeof(*cmd), 0) == sizeof(*cmd)) {
 	if (recv(fd, reply, sizeof(*reply), 0) != sizeof(*reply)) {
-	    warn("invalid reply from APM daemon\n");
+	    warn("invalid reply from APM daemon");
 	    return 1;
 	}
     } else {
@@ -277,7 +279,7 @@ main(int argc, char *argv[])
 	    break;
 	}
     } else
-	errx(rval, "cannot get reply from APM daemon\n");
+	errx(rval, "cannot get reply from APM daemon");
 
     exit(0);
 }
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index bf43bd790f5..c60e91739ff 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: arp.c,v 1.8 1997/09/12 04:07:16 millert Exp $ */
 /*	$NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
 
 /*
@@ -518,7 +519,7 @@ getinetaddr(host, inap)
 	if (inet_aton(host, inap) == 1)
 		return (0);
 	if ((hp = gethostbyname(host)) == NULL) {
-		warnx("%s: %s\n", host, hstrerror(h_errno));
+		warnx("%s: %s", host, hstrerror(h_errno));
 		return (-1);
 	}
 	(void)memcpy(inap, hp->h_addr, sizeof(*inap));
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index e561dbddee7..9ca16a1d0ac 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.6 1997/06/18 00:00:45 deraadt Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.7 1997/09/12 04:07:17 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.6 1997/06/18 00:00:45 deraadt Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.7 1997/09/12 04:07:17 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -242,7 +242,7 @@ ng_load(fname)
 					break;
 
 				case 1:
-					warnx("Duplicate entry netgroup `%s'\n",
+					warnx("Duplicate entry netgroup `%s'",
 					      head->n_name);
 					break;
 
@@ -500,7 +500,7 @@ ng_print(e, str)
 			break;
 
 		default:
-			errx(1, "Internal error: Bad netgroup type\n");
+			errx(1, "Internal error: Bad netgroup type");
 			break;
 		}
 		str_append(str, ptr, ' ');
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index bf402a429d7..d1a75e12103 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.12 1997/08/10 04:55:18 millert Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.13 1997/09/12 04:07:19 millert Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 from: static char sccsid[] = "@(#)pstat.c	8.9 (Berkeley) 2/16/94";
 #else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.12 1997/08/10 04:55:18 millert Exp $";
+static char *rcsid = "$OpenBSD: pstat.c,v 1.13 1997/09/12 04:07:19 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -918,7 +918,7 @@ getfiles(abuf, alen)
 	 * Add emulation of KINFO_FILE here.
 	 */
 	if (memf != NULL)
-		errx(1, "files on dead kernel, not implemented\n");
+		errx(1, "files on dead kernel, not implemented");
 
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_FILE;
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index b9442784375..8649d7a1008 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.12 1997/08/18 03:11:32 millert Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.13 1997/09/12 04:07:20 millert Exp $ */
 /*	$NetBSD: rarpd.c,v 1.12 1996/03/21 18:28:23 jtc Exp $	*/
 
 /*
@@ -28,7 +28,7 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.12 1997/08/18 03:11:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.13 1997/09/12 04:07:20 millert Exp $";
 #endif
 
 
@@ -579,7 +579,7 @@ rarp_process(ii, pkt)
 
 	if (target_ipaddr == 0) {
 		in.s_addr = ii->ii_ipaddr & ii->ii_netmask;
-		err(NONFATAL, "cannot find %s on net %s\n",
+		err(NONFATAL, "cannot find %s on net %s",
 		    ename, inet_ntoa(in));
 		return;
 	}
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index 45d693aa48f..3b1db09b3fa 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -114,7 +114,7 @@ main(argc, argv)
 		if (ConfigFile == NULL)
 			ConfigFile = argv[optind];
 		else {
-			warnx("too many config files (`%s' ignored)\n",
+			warnx("too many config files (`%s' ignored)",
 			    argv[optind]);
 		}
 	}
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index 157423fb408..74d7a12357e 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trsp.c,v 1.5 1997/09/08 09:23:17 deraadt Exp $	*/
+/*	$OpenBSD: trsp.c,v 1.6 1997/09/12 04:07:23 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -233,11 +233,11 @@ main(argc, argv)
 
 		if (kvm_write(kd, nl[N_SPP_DEBX].n_value, &spp_debx,
 		    sizeof(spp_debx)) != sizeof(spp_debx))
-			errx(4, "write spp_debx: %s\n", kvm_geterr(kd));
+			errx(4, "write spp_debx: %s", kvm_geterr(kd));
 		
 		if (kvm_write(kd, nl[N_SPP_DEBUG].n_value, spp_debug,
 		    sizeof(spp_debug)) != sizeof(spp_debug))
-			errx(4, "write spp_debug: %s\n", kvm_geterr(kd));
+			errx(4, "write spp_debug: %s", kvm_geterr(kd));
 
 		exit(0);
 	}