From eda9e509bbc81a219a3513d91752daed839ec1fa Mon Sep 17 00:00:00 2001
From: grant <grant@NetBSD.org>
Date: Sat, 20 Jul 2002 08:40:16 +0000
Subject: [PATCH] sweep of errx/warnx, remove unnecessary trailing \n

---
 usr.bin/audio/play/play.c              |  6 +++---
 usr.bin/audio/record/record.c          | 18 +++++++++---------
 usr.bin/fgen/fgen.l                    |  4 ++--
 usr.bin/xlint/xlint/xlint.c            |  6 +++---
 usr.sbin/apm/apm.c                     |  4 ++--
 usr.sbin/installboot/arch/alpha.c      |  6 +++---
 usr.sbin/irdaattach/irdaattach.c       |  4 ++--
 usr.sbin/lpr/lpc/lpc.c                 |  6 +++---
 usr.sbin/makefs/ffs/ffs_alloc.c        |  6 +++---
 usr.sbin/mld6query/mld6.c              |  6 +++---
 usr.sbin/netgroup_mkdb/netgroup_mkdb.c |  8 ++++----
 usr.sbin/pcictl/pcictl.c               |  4 ++--
 usr.sbin/pkg_install/admin/main.c      |  8 ++++----
 usr.sbin/pkg_install/delete/main.c     |  6 +++---
 usr.sbin/pkg_install/lib/file.c        |  6 +++---
 usr.sbin/pkg_install/lib/ftpio.c       |  8 ++++----
 usr.sbin/quotaon/quotaon.c             |  6 +++---
 usr.sbin/rbootd/rbootd.c               |  6 +++---
 usr.sbin/rpc.lockd/test.c              |  6 +++---
 usr.sbin/sunlabel/sunlabel.c           | 10 +++++-----
 usr.sbin/trsp/trsp.c                   |  8 ++++----
 usr.sbin/user/user.c                   |  8 ++++----
 usr.sbin/wsmuxctl/wsmuxctl.c           |  4 ++--
 usr.sbin/yppoll/yppoll.c               |  8 ++++----
 usr.sbin/ypset/ypset.c                 |  6 +++---
 25 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/usr.bin/audio/play/play.c b/usr.bin/audio/play/play.c
index 040397a015cf..c165fe6d67e3 100644
--- a/usr.bin/audio/play/play.c
+++ b/usr.bin/audio/play/play.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: play.c,v 1.36 2002/02/10 13:15:08 mrg Exp $	*/
+/*	$NetBSD: play.c,v 1.37 2002/07/20 08:40:16 grant Exp $	*/
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -135,7 +135,7 @@ main(argc, argv)
 		case 's':
 			decode_int(optarg, &sample_rate);
 			if (sample_rate < 0 || sample_rate > 48000 * 2)	/* XXX */
-				errx(1, "sample rate must be between 0 and 96000\n");
+				errx(1, "sample rate must be between 0 and 96000");
 			break;
 		case 'V':
 			verbose++;
@@ -143,7 +143,7 @@ main(argc, argv)
 		case 'v':
 			volume = atoi(optarg);
 			if (volume < 0 || volume > 255)
-				errx(1, "volume must be between 0 and 255\n");
+				errx(1, "volume must be between 0 and 255");
 			break;
 		/* case 'h': */
 		default:
diff --git a/usr.bin/audio/record/record.c b/usr.bin/audio/record/record.c
index db28b7f313fe..cd3cb3e37d46 100644
--- a/usr.bin/audio/record/record.c
+++ b/usr.bin/audio/record/record.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: record.c,v 1.29 2002/07/20 07:45:08 mrg Exp $	*/
+/*	$NetBSD: record.c,v 1.30 2002/07/20 08:40:16 grant Exp $	*/
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -100,7 +100,7 @@ main(argc, argv)
 		case 'b':
 			decode_int(optarg, &balance);
 			if (balance < 0 || balance > 63)
-				errx(1, "balance must be between 0 and 63\n");
+				errx(1, "balance must be between 0 and 63");
 			break;
 		case 'C':
 			/* Ignore, compatibility */
@@ -114,7 +114,7 @@ main(argc, argv)
 		case 'c':
 			decode_int(optarg, &channels);
 			if (channels < 0 || channels > 16)
-				errx(1, "channels must be between 0 and 16\n");
+				errx(1, "channels must be between 0 and 16");
 			break;
 		case 'd':
 			device = optarg;
@@ -131,7 +131,7 @@ main(argc, argv)
 		case 'm':
 			decode_int(optarg, &monitor_gain);
 			if (monitor_gain < 0 || monitor_gain > 255)
-				errx(1, "monitor volume must be between 0 and 255\n");
+				errx(1, "monitor volume must be between 0 and 255");
 			break;
 		case 'P':
 			decode_int(optarg, &precision);
@@ -160,7 +160,7 @@ main(argc, argv)
 		case 's':
 			decode_int(optarg, &sample_rate);
 			if (sample_rate < 0 || sample_rate > 48000 * 2)	/* XXX */
-				errx(1, "sample rate must be between 0 and 96000\n");
+				errx(1, "sample rate must be between 0 and 96000");
 			break;
 		case 't':
 			no_time_limit = 0;
@@ -172,7 +172,7 @@ main(argc, argv)
 		case 'v':
 			decode_int(optarg, &gain);
 			if (gain < 0 || gain > 255)
-				errx(1, "volume must be between 0 and 255\n");
+				errx(1, "volume must be between 0 and 255");
 			break;
 		/* case 'h': */
 		default:
@@ -512,7 +512,7 @@ write_header_wav(hdrp, lenp, leftp)
 			static int warned = 0;
 
 			if (warned == 0) {
-				warnx("can not support precision of %d\n", precision);
+				warnx("can not support precision of %d", precision);
 				warned = 1;
 			}
 		}
@@ -585,9 +585,9 @@ fmt_pcm:
 				const char *s = wav_enc_from_val(encoding);
 
 				if (s == NULL)
-					warnx("can not support encoding of %s\n", s);
+					warnx("can not support encoding of %s", s);
 				else
-					warnx("can not support encoding of %d\n", encoding);
+					warnx("can not support encoding of %d", encoding);
 				warned = 1;
 			}
 		}
diff --git a/usr.bin/fgen/fgen.l b/usr.bin/fgen/fgen.l
index f135abdfa370..6b75ffe6f782 100644
--- a/usr.bin/fgen/fgen.l
+++ b/usr.bin/fgen/fgen.l
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: fgen.l,v 1.19 2002/06/11 00:04:28 eeh Exp $	*/
+/*	$NetBSD: fgen.l,v 1.20 2002/07/20 08:40:16 grant Exp $	*/
 /* FLEX input for FORTH input file scanner */
 /*  
  * Copyright (c) 1998 Eduardo Horvath.
@@ -1013,7 +1013,7 @@ main(argc, argv)
 			break;
 		case '?':
 		default:
-			warnx("Illegal argument: %c\n", ch);
+			warnx("Illegal argument: %c", ch);
 			usage(myname);
 		}
 	argc -= optind;
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index c5d280712891..d5356822f720 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.28 2002/06/14 23:20:42 simonb Exp $ */
+/* $NetBSD: xlint.c,v 1.29 2002/07/20 08:40:17 grant Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: xlint.c,v 1.28 2002/06/14 23:20:42 simonb Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.29 2002/07/20 08:40:17 grant Exp $");
 #endif
 
 #include <sys/param.h>
@@ -602,7 +602,7 @@ fname(const char *name)
 
 	if (!is_stdin && strcmp(suff, "c") != 0 &&
 	    (strncmp(bn, "llib-l", 6) != 0 || bn != suff)) {
-		warnx("unknown file type: %s\n", name);
+		warnx("unknown file type: %s", name);
 		return;
 	}
 
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 97a61af048cb..f3ef7ab46302 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: apm.c,v 1.12 2001/09/13 11:05:58 enami Exp $ */
+/*	$NetBSD: apm.c,v 1.13 2002/07/20 08:40:17 grant Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -335,7 +335,7 @@ printval:
 			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/installboot/arch/alpha.c b/usr.sbin/installboot/arch/alpha.c
index 4aaa354889ee..17a7582f65af 100644
--- a/usr.sbin/installboot/arch/alpha.c
+++ b/usr.sbin/installboot/arch/alpha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: alpha.c,v 1.12 2002/05/31 05:54:36 matt Exp $	*/
+/*	$NetBSD: alpha.c,v 1.13 2002/07/20 08:40:17 grant Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: alpha.c,v 1.12 2002/05/31 05:54:36 matt Exp $");
+__RCSID("$NetBSD: alpha.c,v 1.13 2002/07/20 08:40:17 grant Exp $");
 #endif	/* !__lint */
 
 #if HAVE_CONFIG_H
@@ -174,7 +174,7 @@ alpha_clearboot(ib_params *params)
 	    "Old boot block checksum invalid (was %#llx, calculated %#llx)",
 		    (unsigned long long)bb.bb_cksum,
 		    (unsigned long long)cksum);
-		warnx("Boot block invalid\n");
+		warnx("Boot block invalid");
 		return (0);
 	}
 
diff --git a/usr.sbin/irdaattach/irdaattach.c b/usr.sbin/irdaattach/irdaattach.c
index b66ca91fe3b5..0a9f610816f1 100644
--- a/usr.sbin/irdaattach/irdaattach.c
+++ b/usr.sbin/irdaattach/irdaattach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: irdaattach.c,v 1.3 2001/12/14 20:10:19 thorpej Exp $	*/
+/*	$NetBSD: irdaattach.c,v 1.4 2002/07/20 08:40:17 grant Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@ main(int argc, char **argv)
 	else if (strcmp(donglename, "girbil") == 0)
 		dongle = DONGLE_GIRBIL;
 	else
-		errx(1, "Unknown dongle\n");
+		errx(1, "Unknown dongle");
 	if (ioctl(fd, IRFRAMETTY_SET_DONGLE, &dongle) < 0)
 		err(1, "IRFRAMETTY_SET_DONGLE");
 
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index fae0931eedab..f0b0f13913a4 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpc.c,v 1.13 2002/07/14 15:27:59 wiz Exp $	*/
+/*	$NetBSD: lpc.c,v 1.14 2002/07/20 08:40:18 grant Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: lpc.c,v 1.13 2002/07/14 15:27:59 wiz Exp $");
+__RCSID("$NetBSD: lpc.c,v 1.14 2002/07/20 08:40:18 grant Exp $");
 #endif
 #endif /* not lint */
 
@@ -301,7 +301,7 @@ ingroup(char *grname)
 
 	if (gptr == NULL) {
 		if ((gptr = getgrnam(grname)) == NULL) {
-			warnx("Warning: unknown group `%s'\n",
+			warnx("Warning: unknown group `%s'",
 				grname);
 			return(0);
 		}
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index d7a9636af970..56332ea5906b 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_alloc.c,v 1.9 2002/02/06 15:36:30 lukem Exp $	*/
+/*	$NetBSD: ffs_alloc.c,v 1.10 2002/07/20 08:40:18 grant Exp $	*/
 /* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
 
 /*
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.9 2002/02/06 15:36:30 lukem Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.10 2002/07/20 08:40:18 grant Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
@@ -485,7 +485,7 @@ ffs_blkfree(struct inode *ip, ufs_daddr_t bno, long size)
 	}
 	cg = dtog(fs, bno);
 	if ((u_int)bno >= fs->fs_size) {
-		warnx("bad block %d, ino %d\n", bno, ip->i_number);
+		warnx("bad block %d, ino %d", bno, ip->i_number);
 		return;
 	}
 	error = bread(ip->i_fd, ip->i_fs, fsbtodb(fs, cgtod(fs, cg)),
diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c
index 75cdfade3820..080391626d31 100644
--- a/usr.sbin/mld6query/mld6.c
+++ b/usr.sbin/mld6query/mld6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mld6.c,v 1.4 2001/05/07 14:00:22 kleink Exp $	*/
+/*	$NetBSD: mld6.c,v 1.5 2002/07/20 08:40:18 grant Exp $	*/
 /*	$KAME: mld6.c,v 1.9 2000/12/04 06:29:37 itojun Exp $	*/
 
 /*
@@ -234,12 +234,12 @@ make_msg(int index, struct in6_addr *addr, u_int type)
 		errx(1, "inet6_opt_finish(buf) failed");
 #else  /* old advanced API */
 	if (inet6_option_init((void *)cmsgp, &cmsgp, IPV6_HOPOPTS))
-		errx(1, "inet6_option_init failed\n");
+		errx(1, "inet6_option_init failed");
 	raopt[0] = IP6OPT_RTALERT;
 	raopt[1] = IP6OPT_RTALERT_LEN - 2;
 	memcpy(&raopt[2], (caddr_t)&rtalert_code, sizeof(u_short));
 	if (inet6_option_append(cmsgp, raopt, 4, 0))
-		errx(1, "inet6_option_append failed\n");
+		errx(1, "inet6_option_append failed");
 #endif 
 }
 
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index ded81d47a9fc..a75ef5732e01 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netgroup_mkdb.c,v 1.11 2001/02/19 23:22:45 cgd Exp $	*/
+/*	$NetBSD: netgroup_mkdb.c,v 1.12 2002/07/20 08:40:18 grant Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: netgroup_mkdb.c,v 1.11 2001/02/19 23:22:45 cgd Exp $");
+__RCSID("$NetBSD: netgroup_mkdb.c,v 1.12 2002/07/20 08:40:18 grant Exp $");
 #endif
 
 #include <sys/types.h>
@@ -245,7 +245,7 @@ ng_load(fname)
 					break;
 
 				case 1:
-					warnx("Duplicate entry netgroup `%s'\n",
+					warnx("Duplicate entry netgroup `%s'",
 					      head->n_name);
 					break;
 
@@ -507,7 +507,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/pcictl/pcictl.c b/usr.sbin/pcictl/pcictl.c
index 9bacd005c1e5..ec496232ae9b 100644
--- a/usr.sbin/pcictl/pcictl.c
+++ b/usr.sbin/pcictl/pcictl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcictl.c,v 1.5 2001/11/08 08:05:05 tron Exp $	*/
+/*	$NetBSD: pcictl.c,v 1.6 2002/07/20 08:40:18 grant Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
 
 	/* Make sure the device is a PCI bus. */
 	if (ioctl(pcifd, PCI_IOC_BUSINFO, &pci_businfo) != 0)
-		errx(1, "%s: not a PCI bus device\n", dvname);
+		errx(1, "%s: not a PCI bus device", dvname);
 
 	(*commands[i].cmd_func)(argc, argv);
 	exit(0);
diff --git a/usr.sbin/pkg_install/admin/main.c b/usr.sbin/pkg_install/admin/main.c
index ab6ca89beaf8..589d15e3da3c 100644
--- a/usr.sbin/pkg_install/admin/main.c
+++ b/usr.sbin/pkg_install/admin/main.c
@@ -1,8 +1,8 @@
-/*	$NetBSD: main.c,v 1.27 2002/07/19 19:04:35 yamt Exp $	*/
+/*	$NetBSD: main.c,v 1.28 2002/07/20 08:40:19 grant Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.27 2002/07/19 19:04:35 yamt Exp $");
+__RCSID("$NetBSD: main.c,v 1.28 2002/07/20 08:40:19 grant Exp $");
 #endif
 
 /*
@@ -75,7 +75,7 @@ check1pkg(const char *pkgdir)
 	read_plist(&Plist, f);
 	p = find_plist(&Plist, PLIST_NAME);
 	if (p == NULL)
-		errx(1, "Package %s has no @name, aborting.\n",
+		errx(1, "Package %s has no @name, aborting.",
 		    pkgdir);
 	PkgName = p->name;
 	for (p = Plist.head; p; p = p->next) {
@@ -200,7 +200,7 @@ rebuild(void)
 		read_plist(&Plist, f);
 		p = find_plist(&Plist, PLIST_NAME);
 		if (p == NULL)
-			errx(1, "Package %s has no @name, aborting.\n",
+			errx(1, "Package %s has no @name, aborting.",
 			    de->d_name);
 		PkgName = p->name;
 		for (p = Plist.head; p; p = p->next) {
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 9a6c65785b12..ca5670aad45d 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: main.c,v 1.19 2002/06/09 13:23:45 yamt Exp $	*/
+/*	$NetBSD: main.c,v 1.20 2002/07/20 08:40:19 grant Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.19 2002/06/09 13:23:45 yamt Exp $");
+__RCSID("$NetBSD: main.c,v 1.20 2002/07/20 08:40:19 grant Exp $");
 #endif
 #endif
 
@@ -148,7 +148,7 @@ main(int argc, char **argv)
 				if (rc == 0)
 					errx(1, "No matching pkg for %s.", *argv);
 				else if (rc == -1) 
-					errx(1, "error expanding '%s' ('%s' nonexistant?)\n", *argv, _pkgdb_getPKGDB_DIR());
+					errx(1, "error expanding '%s' ('%s' nonexistant?)", *argv, _pkgdb_getPKGDB_DIR());
 			} else {
 				lpp = alloc_lpkg(*argv);
 				TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index c82be4a4a1f0..37acb2a30ee0 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: file.c,v 1.54 2002/07/19 19:04:39 yamt Exp $	*/
+/*	$NetBSD: file.c,v 1.55 2002/07/20 08:40:19 grant Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
 #else
-__RCSID("$NetBSD: file.c,v 1.54 2002/07/19 19:04:39 yamt Exp $");
+__RCSID("$NetBSD: file.c,v 1.55 2002/07/20 08:40:19 grant Exp $");
 #endif
 #endif
 
@@ -240,7 +240,7 @@ fileGetURL(const char *spec)
 
 	rp = NULL;
 	if (!IS_URL(spec)) {
-		errx(1, "fileGetURL was called with non-url arg '%s'\n", spec);
+		errx(1, "fileGetURL was called with non-url arg '%s'", spec);
 	}
 
  	/* Some sanity checks on the URL */
diff --git a/usr.sbin/pkg_install/lib/ftpio.c b/usr.sbin/pkg_install/lib/ftpio.c
index e970be5e0342..d35a99762746 100644
--- a/usr.sbin/pkg_install/lib/ftpio.c
+++ b/usr.sbin/pkg_install/lib/ftpio.c
@@ -1,8 +1,8 @@
-/*	$NetBSD: ftpio.c,v 1.40 2002/07/19 19:04:39 yamt Exp $	*/
+/*	$NetBSD: ftpio.c,v 1.41 2002/07/20 08:40:19 grant Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.40 2002/07/19 19:04:39 yamt Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.41 2002/07/20 08:40:19 grant Exp $");
 #endif
 
 /*
@@ -607,7 +607,7 @@ expandURL(char *expandedurl, const char *wildcardurl)
 		(void) fclose(f);
 		
 		if (matches == 0 && Verbose)
-			warnx("nothing appropriate found\n");
+			warnx("nothing appropriate found");
 	}
 
 	unlink(tmpname);
@@ -822,7 +822,7 @@ miscstuff(const char *url)
 static void
 usage(void)
 {
-  errx(1, "Usage: foo [-v] ftp://-pattern\n");
+  errx(1, "Usage: foo [-v] ftp://-pattern");
 }
 
 
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 2234fa96287e..576c7fece0e2 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: quotaon.c,v 1.16 2001/02/19 23:22:46 cgd Exp $	*/
+/*	$NetBSD: quotaon.c,v 1.17 2002/07/20 08:40:20 grant Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: quotaon.c,v 1.16 2001/02/19 23:22:46 cgd Exp $");
+__RCSID("$NetBSD: quotaon.c,v 1.17 2002/07/20 08:40:20 grant Exp $");
 #endif
 #endif /* not lint */
 
@@ -95,7 +95,7 @@ main(argc, argv)
 	if (strcmp(getprogname(), "quotaoff") == 0)
 		offmode++;
 	else if (strcmp(getprogname(), "quotaon") != 0)
-		errx(1, "Name must be quotaon or quotaoff\n");
+		errx(1, "Name must be quotaon or quotaoff");
 
 	while ((ch = getopt(argc, argv, "avug")) != -1) {
 		switch(ch) {
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index 3fb8b8c2d930..c6f95f1c6476 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbootd.c,v 1.14 2001/02/19 23:22:46 cgd Exp $	*/
+/*	$NetBSD: rbootd.c,v 1.15 2002/07/20 08:40:20 grant Exp $	*/
 
 /*
  * Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -57,7 +57,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: rbootd.c,v 1.14 2001/02/19 23:22:46 cgd Exp $");
+__RCSID("$NetBSD: rbootd.c,v 1.15 2002/07/20 08:40:20 grant Exp $");
 #endif
 #endif /* not lint */
 
@@ -119,7 +119,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/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index 096851798081..5bf16aea3837 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: test.c,v 1.2 1997/10/18 04:01:21 lukem Exp $	*/
+/*	$NetBSD: test.c,v 1.3 2002/07/20 08:40:20 grant Exp $	*/
 
 #include <sys/cdefs.h>
 #include <rpc/rpc.h>
@@ -8,7 +8,7 @@
 static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";
 static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";
 #else
-__RCSID("$NetBSD: test.c,v 1.2 1997/10/18 04:01:21 lukem Exp $");
+__RCSID("$NetBSD: test.c,v 1.3 2002/07/20 08:40:20 grant Exp $");
 #endif
 #endif				/* not lint */
 
@@ -316,7 +316,7 @@ main(int argc, char **argv)
 	printf("Creating client for host %s\n", argv[1]);
 	cli = clnt_create(argv[1], NLM_PROG, NLM_VERS, "udp");
 	if (!cli) {
-		errx(1, "Failed to create client\n");
+		errx(1, "Failed to create client");
 		/* NOTREACHED */
 	}
 	clnt_control(cli, CLGET_TIMEOUT, &tim);
diff --git a/usr.sbin/sunlabel/sunlabel.c b/usr.sbin/sunlabel/sunlabel.c
index 097ee4859079..e0b977af8d91 100644
--- a/usr.sbin/sunlabel/sunlabel.c
+++ b/usr.sbin/sunlabel/sunlabel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunlabel.c,v 1.5 2002/05/16 09:55:50 wiz Exp $ */
+/* $NetBSD: sunlabel.c,v 1.6 2002/07/20 08:40:20 grant Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sunlabel.c,v 1.5 2002/05/16 09:55:50 wiz Exp $");
+__RCSID("$NetBSD: sunlabel.c,v 1.6 2002/07/20 08:40:20 grant Exp $");
 
 #include <stdio.h>
 #include <errno.h>
@@ -580,7 +580,7 @@ getlabel(void)
 
 	lerr = unpack_label();
 	if (lerr)
-		errx(1, "bogus label on `%s' (%s)\n", diskname, lerr);
+		errx(1, "bogus label on `%s' (%s)", diskname, lerr);
 }
 
 /*
@@ -810,7 +810,7 @@ chpart(int pno, const char *numbers)
 		}
 	}
 	if (label.spc && (size % label.spc)) {
-		warnx("Size is not a multiple of cylinder size (is %u/%u/%u)\n",
+		warnx("Size is not a multiple of cylinder size (is %u/%u/%u)",
 		    size / label.spc,
 		    (size % label.spc) / label.nsect, size % label.nsect);
 	}
@@ -1180,7 +1180,7 @@ setlabel(void)
 		return;
 	}
 	if (u.l.d_secsize != 512) {
-		warnx("Disk claims %d-byte sectors\n", (int)u.l.d_secsize);
+		warnx("Disk claims %d-byte sectors", (int)u.l.d_secsize);
 	}
 	u.l.d_nsectors = label.nsect;
 	u.l.d_ntracks = label.nhead;
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index fb5aee81cb05..3033dbea8edb 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trsp.c,v 1.6 2001/02/19 23:22:48 cgd Exp $	*/
+/*	$NetBSD: trsp.c,v 1.7 2002/07/20 08:40:21 grant Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)trsp.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: trsp.c,v 1.6 2001/02/19 23:22:48 cgd Exp $");
+__RCSID("$NetBSD: trsp.c,v 1.7 2002/07/20 08:40:21 grant Exp $");
 #endif
 #endif /* not lint */
 
@@ -242,11 +242,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);
 	}
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 1f30422a3d67..531f4ce5ffeb 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $NetBSD: user.c,v 1.53 2002/07/08 22:17:47 agc Exp $ */
+/* $NetBSD: user.c,v 1.54 2002/07/20 08:40:21 grant Exp $ */
 
 /*
  * Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -35,7 +35,7 @@
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1999 \
 	        The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: user.c,v 1.53 2002/07/08 22:17:47 agc Exp $");
+__RCSID("$NetBSD: user.c,v 1.54 2002/07/20 08:40:21 grant Exp $");
 #endif
 
 #include <sys/types.h>
@@ -245,7 +245,7 @@ removehomedir(const char *user, int uid, const char *dir)
 
 	/* userid matches directory owner? */
 	if (st.st_uid != uid) {
-		warnx("User `%s' doesn't own directory `%s', not removed\n", user, dir);
+		warnx("User `%s' doesn't own directory `%s', not removed", user, dir);
 		return 0;
 	}
 
@@ -254,7 +254,7 @@ removehomedir(const char *user, int uid, const char *dir)
 	(void) asystem("%s -rf %s > /dev/null 2>&1 || true", RM, dir);
 	(void) seteuid(0);
 	if (rmdir(dir) < 0) {
-		warnx("Unable to remove all files in `%s'\n", dir);
+		warnx("Unable to remove all files in `%s'", dir);
 		return 0;
 	}
 	return 1;
diff --git a/usr.sbin/wsmuxctl/wsmuxctl.c b/usr.sbin/wsmuxctl/wsmuxctl.c
index 8e899b7ada76..b79be51ef16f 100644
--- a/usr.sbin/wsmuxctl/wsmuxctl.c
+++ b/usr.sbin/wsmuxctl/wsmuxctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmuxctl.c,v 1.5 2002/07/07 15:13:55 drochner Exp $ */
+/* $NetBSD: wsmuxctl.c,v 1.6 2002/07/20 08:40:21 grant Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ parsedev(const char *dev, struct wsmux_device *mdev)
 		mdev->type = WSMUX_MUX;
 		return;
 	}
-	errx(1, "bad device: `%s', use wsmouse, wskdb, or wsmux\n", dev);
+	errx(1, "bad device: `%s', use wsmouse, wskdb, or wsmux", dev);
 }
 
 static void
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 3408f2b80895..14860bd4271b 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: yppoll.c,v 1.9 2001/02/19 23:22:50 cgd Exp $	*/
+/*	$NetBSD: yppoll.c,v 1.10 2002/07/20 08:40:22 grant Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: yppoll.c,v 1.9 2001/02/19 23:22:50 cgd Exp $");
+__RCSID("$NetBSD: yppoll.c,v 1.10 2002/07/20 08:40:22 grant Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -111,7 +111,7 @@ main(argc, argv)
 	}
 
 	if (r != 0)
-		errx(1, "no such map %s. Reason: %s\n",
+		errx(1, "no such map %s. Reason: %s",
 		    inmap, yperr_string(r));
 
 	printf("Map %s has order number %d. %s", inmap, order,
@@ -155,7 +155,7 @@ get_remote_info(indomain, inmap, server, outorder, outname)
 
 	client = clntudp_create(&rsrv_sin, YPPROG, YPVERS, tv, &rsrv_sock);
 	if (client == NULL)
-		errx(1, "clntudp_create: no contact with host %s.\n", server);
+		errx(1, "clntudp_create: no contact with host %s.", server);
 	
 	yprnk.domain = indomain;
 	yprnk.map = inmap;
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 938b531aa07c..d5ffb0c32751 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ypset.c,v 1.13 2001/02/19 23:22:53 cgd Exp $	*/
+/*	$NetBSD: ypset.c,v 1.14 2002/07/20 08:40:22 grant Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ypset.c,v 1.13 2001/02/19 23:22:53 cgd Exp $");
+__RCSID("$NetBSD: ypset.c,v 1.14 2002/07/20 08:40:22 grant Exp $");
 #endif
 
 #include <sys/param.h>
@@ -155,7 +155,7 @@ bind_tohost(sin, dom, server)
 	r = clnt_call(client, YPBINDPROC_SETDOM,
 	    xdr_ypbind_setdom, &ypsd, xdr_void, NULL, tv);
 	if (r) {
-		warnx("Cannot ypset for domain %s on host %s: %s.\n",
+		warnx("Cannot ypset for domain %s on host %s: %s.",
 		    dom, server, clnt_sperrno(r));
 		clnt_destroy(client);
 		return YPERR_YPBIND;