Use errc/warnc to simplify code.

Also, in 'ftp', always put the error message last, after the hostname/ipaddr.

ok jsing@ krw@ millert@

6 files changed, 25 insertions, 20 deletions

diff --git a/usr.sbin/crunchgen/elf_hide.c b/usr.sbin/crunchgen/elf_hide.c
index b6e553bcf0d..40ab159fd59 100644
--- a/usr.sbin/crunchgen/elf_hide.c
+++ b/usr.sbin/crunchgen/elf_hide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf_hide.c,v 1.7 2013/11/12 19:48:40 deraadt Exp $ */
+/* $OpenBSD: elf_hide.c,v 1.8 2014/05/20 01:25:24 guenther Exp $ */
 
 /*
  * Copyright (c) 1997 Dale Rahn.
@@ -354,7 +354,7 @@ reorder_syms(Elf_Ehdr * ehdr, Elf_Shdr * symsect,
 	tmpsymtab = (Elf_Sym *) calloc(1, symtabsize);
 	symmap = (Symmap *) calloc(nsyms, sizeof(Symmap));
 	if (!tmpsymtab || !symmap)
-		errx(5, "calloc: %s", strerror(ENOMEM));
+		errc(5, ENOMEM, "calloc");
 
 	bcopy(symtab, tmpsymtab, symtabsize);
 
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index 26356453bc7..1de7eb7ce7c 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.44 2013/11/12 13:11:10 deraadt Exp $	*/
+/*	$OpenBSD: nlist.c,v 1.45 2014/05/20 01:25:24 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -320,7 +320,7 @@ create_knlist(char *name, int fd, DB *db)
 	error = __elf_knlist(fd, db, ksyms);
 
 	if (fmterr != NULL)
-		warnx("%s: %s: %s", kfile, fmterr, strerror(EFTYPE));
+		warnc(EFTYPE, "%s: %s", kfile, fmterr);
 
 	return(error);
 }
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 182831cca2b..dc13643acd6 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpr.c,v 1.45 2013/11/24 21:32:32 deraadt Exp $ */
+/*	$OpenBSD: lpr.c,v 1.46 2014/05/20 01:25:24 guenther Exp $ */
 /*	$NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $	*/
 
 /*
@@ -665,7 +665,7 @@ mktemps(void)
 	struct stat stb;
 
 	if (snprintf(buf, sizeof(buf), "%s/.seq", SD) >= sizeof(buf))
-		errx(1, "%s/.seq: %s", SD, strerror(ENAMETOOLONG));
+		errc(1, ENAMETOOLONG, "%s/.seq", SD);
 	PRIV_START;
 	if ((fd = safe_open(buf, O_RDWR|O_CREAT|O_NOFOLLOW, 0661)) < 0)
 		err(1, "cannot open %s", buf);
diff --git a/usr.sbin/pcidump/pcidump.c b/usr.sbin/pcidump/pcidump.c
index 3e601011d62..065d2cf9402 100644
--- a/usr.sbin/pcidump/pcidump.c
+++ b/usr.sbin/pcidump/pcidump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcidump.c,v 1.35 2013/11/12 19:48:53 deraadt Exp $	*/
+/*	$OpenBSD: pcidump.c,v 1.36 2014/05/20 01:25:24 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007 David Gwynne <loki@animata.net>
@@ -184,7 +184,7 @@ main(int argc, char *argv[])
 			error = probe(bus, dev, func);
 
 		if (error != 0)
-			errx(1, "\"%s\": %s", argv[0], strerror(error));
+			errc(1, error, "\"%s\"", argv[0]);
 	} else {
 		printf("Domain %s:\n", pcidev);
 		scanpcidomain();
diff --git a/usr.sbin/procmap/procmap.c b/usr.sbin/procmap/procmap.c
index 4a22bbd630e..c1447915485 100644
--- a/usr.sbin/procmap/procmap.c
+++ b/usr.sbin/procmap/procmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procmap.c,v 1.52 2014/02/13 21:17:13 tedu Exp $ */
+/*	$OpenBSD: procmap.c,v 1.53 2014/05/20 01:25:24 guenther Exp $ */
 /*	$NetBSD: pmap.c,v 1.1 2002/09/01 20:32:44 atatat Exp $ */
 
 /*
@@ -309,8 +309,7 @@ main(int argc, char *argv[])
 			kproc = kvm_getprocs(kd, KERN_PROC_PID, pid,
 			    sizeof(struct kinfo_proc), &rc);
 			if (kproc == NULL || rc == 0) {
-				errno = ESRCH;
-				warn("%d", pid);
+				warnc(ESRCH, "%d", pid);
 				pid = -1;
 				continue;
 			}
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index fdc1312d48b..ba75c34a06f 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd_mkdb.c,v 1.43 2010/01/08 13:29:08 oga Exp $	*/
+/*	$OpenBSD: pwd_mkdb.c,v 1.44 2014/05/20 01:25:24 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -75,6 +75,7 @@ static int hasyp;				/* are we running YP? */
 
 void	cleanup(void);
 void	error(char *);
+void	errorc(int, char *);
 void	errorx(char *);
 void	cp(char *, char *, mode_t);
 void	mv(char *, char *);
@@ -360,8 +361,7 @@ scan(FILE *fp, struct passwd *pw, int *flags)
 	*flags = 0;
 	if (!pw_scan(line, pw, flags)) {
 		warnx("at line #%d", lcnt);
-fmt:		errno = EFTYPE;	/* XXX */
-		error(pname);
+fmt:		errorc(EFTYPE, pname);
 	}
 
 	return (1);
@@ -383,16 +383,14 @@ cp(char *from, char *to, mode_t mode)
 			int sverrno = errno;
 
 			(void)snprintf(buf, sizeof(buf), "%s to %s", from, to);
-			errno = sverrno;
-			error(buf);
+			errorc(sverrno, buf);
 		}
 	}
 	if (rcount < 0) {
 		int sverrno = errno;
 
 		(void)snprintf(buf, sizeof(buf), "%s to %s", from, to);
-		errno = sverrno;
-		error(buf);
+		errorc(sverrno, buf);
 	}
 	close(to_fd);
 	close(from_fd);
@@ -407,8 +405,7 @@ mv(char *from, char *to)
 		int sverrno = errno;
 
 		(void)snprintf(buf, sizeof(buf), "%s to %s", from, to);
-		errno = sverrno;
-		error(buf);
+		errorc(sverrno, buf);
 	}
 }
 
@@ -422,6 +419,15 @@ error(char *name)
 }
 
 void
+errorc(int code, char *name)
+{
+
+	warnc(code, "%s", name);
+	cleanup();
+	exit(1);
+}
+
+void
 errorx(char *name)
 {