Module Name: src
Committed By: christos
Date: Tue Jun 16 23:04:14 UTC 2015
Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c
src/usr.sbin/altq/altqstat: quip_client.c
src/usr.sbin/btattach: btattach.c init_bcm2035.c init_digi.c
init_ericsson.c init_st.c init_swave.c init_unistone.c
src/usr.sbin/crash: Makefile crash.c
src/usr.sbin/makefs: cd9660.c udf.c
src/usr.sbin/ndiscvt: ndiscvt.c
src/usr.sbin/ndp: ndp.c
src/usr.sbin/npf/npftest: npftest.c
src/usr.sbin/pf/pfs: pfs.c
src/usr.sbin/quotacheck: quotacheck.c
src/usr.sbin/repquota: repquota.c
src/usr.sbin/timed/timed: timed.c
Log Message:
improve error messages (remove \n, use __func__, etc)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/acpitools/acpidump/acpi.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/altqstat/quip_client.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/btattach/btattach.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/btattach/init_bcm2035.c \
src/usr.sbin/btattach/init_digi.c src/usr.sbin/btattach/init_ericsson.c \
src/usr.sbin/btattach/init_st.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/btattach/init_swave.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/btattach/init_unistone.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/crash/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/crash/crash.c
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/udf.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/ndiscvt/ndiscvt.c
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/ndp/ndp.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/npf/npftest/npftest.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/pf/pfs/pfs.c
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/quotacheck/quotacheck.c
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/repquota/repquota.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/timed/timed/timed.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.9 src/usr.sbin/acpitools/acpidump/acpi.c:1.10
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.9 Thu Mar 20 10:39:43 2014
+++ src/usr.sbin/acpitools/acpidump/acpi.c Tue Jun 16 19:04:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.9 2014/03/20 14:39:43 riastradh Exp $ */
+/* $NetBSD: acpi.c,v 1.10 2015/06/16 23:04:13 christos Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: acpi.c,v 1.9 2014/03/20 14:39:43 riastradh Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.10 2015/06/16 23:04:13 christos Exp $");
#include <sys/param.h>
#include <sys/endian.h>
@@ -2480,6 +2480,6 @@ dsdt_from_fadt(ACPI_TABLE_FADT *fadt)
else
sdt = (ACPI_TABLE_HEADER *)acpi_map_sdt(fadt->XDsdt);
if (acpi_checksum(sdt, sdt->Length))
- errx(EXIT_FAILURE, "DSDT is corrupt\n");
+ errx(EXIT_FAILURE, "DSDT is corrupt");
return (sdt);
}
Index: src/usr.sbin/altq/altqstat/quip_client.c
diff -u src/usr.sbin/altq/altqstat/quip_client.c:1.10 src/usr.sbin/altq/altqstat/quip_client.c:1.11
--- src/usr.sbin/altq/altqstat/quip_client.c:1.10 Sat Oct 19 13:16:37 2013
+++ src/usr.sbin/altq/altqstat/quip_client.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: quip_client.c,v 1.10 2013/10/19 17:16:37 christos Exp $ */
+/* $NetBSD: quip_client.c,v 1.11 2015/06/16 23:04:14 christos Exp $ */
/* $KAME: quip_client.c,v 1.9 2003/05/17 05:59:00 itojun Exp $ */
/*
* Copyright (C) 1999-2000
@@ -122,8 +122,7 @@ quip_openserver(void)
strlcpy(addr.sun_path, QUIP_PATH,sizeof(addr.sun_path));
if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- fprintf(stderr, "can't talk to altqd!\n"
- "probably, altqd is not running\n");
+ warnx("can't talk to altqd;probably, altqd is not running");
return (-1);
}
Index: src/usr.sbin/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.12 src/usr.sbin/btattach/btattach.c:1.13
--- src/usr.sbin/btattach/btattach.c:1.12 Sat Aug 27 18:17:53 2011
+++ src/usr.sbin/btattach/btattach.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.12 2011/08/27 22:17:53 joerg Exp $ */
+/* $NetBSD: btattach.c,v 1.13 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btattach.c,v 1.12 2011/08/27 22:17:53 joerg Exp $");
+__RCSID("$NetBSD: btattach.c,v 1.13 2015/06/16 23:04:14 christos Exp $");
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -440,7 +440,7 @@ uart_recv_pkt(int fd, struct iovec *iov,
break;
default: /* out of sync? */
- errx(EXIT_FAILURE, "unknown packet type 0x%2.2x\n", type);
+ errx(EXIT_FAILURE, "unknown packet type 0x%2.2x", type);
}
while (want-- > 0)
Index: src/usr.sbin/btattach/init_bcm2035.c
diff -u src/usr.sbin/btattach/init_bcm2035.c:1.2 src/usr.sbin/btattach/init_bcm2035.c:1.3
--- src/usr.sbin/btattach/init_bcm2035.c:1.2 Tue Apr 14 20:32:23 2009
+++ src/usr.sbin/btattach/init_bcm2035.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_bcm2035.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
+/* $NetBSD: init_bcm2035.c,v 1.3 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_bcm2035.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
+__RCSID("$NetBSD: init_bcm2035.c,v 1.3 2015/06/16 23:04:14 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -66,7 +66,7 @@ init_bcm2035(int fd, unsigned int speed)
case B460800: rate = 0xfd22; break;
case B921600: rate = 0xff55; break;
default:
- errx(EXIT_FAILURE, "invalid speed for bcm2035: %u\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for bcm2035: %u", speed);
};
rate = htole16(rate);
Index: src/usr.sbin/btattach/init_digi.c
diff -u src/usr.sbin/btattach/init_digi.c:1.2 src/usr.sbin/btattach/init_digi.c:1.3
--- src/usr.sbin/btattach/init_digi.c:1.2 Tue Apr 14 20:32:23 2009
+++ src/usr.sbin/btattach/init_digi.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_digi.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
+/* $NetBSD: init_digi.c,v 1.3 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_digi.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
+__RCSID("$NetBSD: init_digi.c,v 1.3 2015/06/16 23:04:14 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -53,7 +53,7 @@ init_digi(int fd, unsigned int speed)
case B57600: rate = 0x08; break;
case B115200: rate = 0x09; break;
default:
- errx(EXIT_FAILURE, "invalid speed for digi: %u\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for digi: %u", speed);
}
uart_send_cmd(fd, HCI_CMD_DIGIANSWER_SET_UART_BAUD_RATE, &rate, sizeof(rate));
Index: src/usr.sbin/btattach/init_ericsson.c
diff -u src/usr.sbin/btattach/init_ericsson.c:1.2 src/usr.sbin/btattach/init_ericsson.c:1.3
--- src/usr.sbin/btattach/init_ericsson.c:1.2 Tue Apr 14 20:32:23 2009
+++ src/usr.sbin/btattach/init_ericsson.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_ericsson.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
+/* $NetBSD: init_ericsson.c,v 1.3 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_ericsson.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
+__RCSID("$NetBSD: init_ericsson.c,v 1.3 2015/06/16 23:04:14 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -78,7 +78,7 @@ init_ericsson(int fd, unsigned int speed
case 300000: rate = 0x27; break;
case 400000: rate = 0x2b; break;
default:
- errx(EXIT_FAILURE, "invalid speed for ericsson: %u\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for ericsson: %u", speed);
}
uart_send_cmd(fd, HCI_CMD_ERICSSON_SET_UART_BAUD_RATE, &rate, sizeof(rate));
Index: src/usr.sbin/btattach/init_st.c
diff -u src/usr.sbin/btattach/init_st.c:1.2 src/usr.sbin/btattach/init_st.c:1.3
--- src/usr.sbin/btattach/init_st.c:1.2 Tue Apr 14 20:32:23 2009
+++ src/usr.sbin/btattach/init_st.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_st.c,v 1.2 2009/04/15 00:32:23 lukem Exp $ */
+/* $NetBSD: init_st.c,v 1.3 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_st.c,v 1.2 2009/04/15 00:32:23 lukem Exp $");
+__RCSID("$NetBSD: init_st.c,v 1.3 2015/06/16 23:04:14 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -59,7 +59,7 @@ init_st(int fd, unsigned int speed)
case B460800: rate = 0x13; break;
case B921600: rate = 0x14; break;
default:
- errx(EXIT_FAILURE, "invalid speed for st: %u\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for st: %u", speed);
}
uart_send_cmd(fd, HCI_CMD_ST_SET_UART_BAUD_RATE, &rate, sizeof(rate));
Index: src/usr.sbin/btattach/init_swave.c
diff -u src/usr.sbin/btattach/init_swave.c:1.3 src/usr.sbin/btattach/init_swave.c:1.4
--- src/usr.sbin/btattach/init_swave.c:1.3 Mon Mar 8 21:01:51 2010
+++ src/usr.sbin/btattach/init_swave.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_swave.c,v 1.3 2010/03/09 02:01:51 kiyohara Exp $ */
+/* $NetBSD: init_swave.c,v 1.4 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_swave.c,v 1.3 2010/03/09 02:01:51 kiyohara Exp $");
+__RCSID("$NetBSD: init_swave.c,v 1.4 2015/06/16 23:04:14 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -78,7 +78,7 @@ init_swave(int fd, unsigned int speed)
case B57600: cp.transport_rate = 0x01; break;
case B115200: cp.transport_rate = 0x00; break;
default:
- errx(EXIT_FAILURE, "invalid speed for swave: %u\n", speed);
+ errx(EXIT_FAILURE, "invalid speed for swave: %u", speed);
}
uart_send_cmd(fd, HCI_CMD_SWAVE_PARAM_ACCESS_SET, &cp, sizeof(cp));
Index: src/usr.sbin/btattach/init_unistone.c
diff -u src/usr.sbin/btattach/init_unistone.c:1.1 src/usr.sbin/btattach/init_unistone.c:1.2
--- src/usr.sbin/btattach/init_unistone.c:1.1 Sun Dec 6 07:55:46 2009
+++ src/usr.sbin/btattach/init_unistone.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_unistone.c,v 1.1 2009/12/06 12:55:46 kiyohara Exp $ */
+/* $NetBSD: init_unistone.c,v 1.2 2015/06/16 23:04:14 christos Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: init_unistone.c,v 1.1 2009/12/06 12:55:46 kiyohara Exp $");
+__RCSID("$NetBSD: init_unistone.c,v 1.2 2015/06/16 23:04:14 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -90,7 +90,7 @@ init_unistone(int fd, unsigned int speed
case B1843200: rate = 0x08; break;
#endif
default:
- errx(EXIT_FAILURE, "invalid speed for infineon unistone: %u\n",
+ errx(EXIT_FAILURE, "invalid speed for infineon unistone: %u",
speed);
}
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.29 src/usr.sbin/crash/Makefile:1.30
--- src/usr.sbin/crash/Makefile:1.29 Mon Feb 9 12:48:07 2015
+++ src/usr.sbin/crash/Makefile Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/02/09 17:48:07 christos Exp $
+# $NetBSD: Makefile,v 1.30 2015/06/16 23:04:14 christos Exp $
PROG= crash
MAN= crash.8
@@ -34,7 +34,7 @@ S= ${.CURDIR}/../../sys
CPPFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${S} -fno-strict-aliasing
CPPFLAGS+= -DDDB_VERBOSE_HELP -DDB_MAX_LINE=10000000 -D_KMEMUSER
-CPPFLAGS+= -UDB_MACHINE_COMMANDS
+CPPFLAGS+= -UDB_MACHINE_COMMANDS -DKERNHIST -DDDB
# ddb files from kernel
.PATH: $S/ddb
Index: src/usr.sbin/crash/crash.c
diff -u src/usr.sbin/crash/crash.c:1.8 src/usr.sbin/crash/crash.c:1.9
--- src/usr.sbin/crash/crash.c:1.8 Mon Oct 6 09:14:36 2014
+++ src/usr.sbin/crash/crash.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: crash.c,v 1.8 2014/10/06 13:14:36 christos Exp $ */
+/* $NetBSD: crash.c,v 1.9 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: crash.c,v 1.8 2014/10/06 13:14:36 christos Exp $");
+__RCSID("$NetBSD: crash.c,v 1.9 2015/06/16 23:04:14 christos Exp $");
#endif /* not lint */
#include <ddb/ddb.h>
@@ -39,6 +39,7 @@ __RCSID("$NetBSD: crash.c,v 1.8 2014/10/
#include <sys/fcntl.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
+#include <sys/kernhist.h>
#include <machine/frame.h>
@@ -72,6 +73,8 @@ static struct nlist nl[] = {
{ .n_name = "_osrelease" },
#define X_PANICSTR 1
{ .n_name = "_panicstr" },
+#define X_KERN_HISTORIES 2
+ { .n_name = "_kern_histories" },
{ .n_name = NULL },
};
@@ -301,6 +304,50 @@ cnputc(int c)
putc(c, ofp);
}
+#define FMTLEN 1024
+#define FNLEN 128
+
+void
+kernhist_dump(struct kern_history *l)
+{
+ unsigned int lcv;
+ struct kern_history kh;
+ struct kern_history_ent ke;
+ char fmt[FMTLEN];
+ char fn[FNLEN];
+
+ db_read_bytes((db_addr_t)l, sizeof(kh), (char *)&kh);
+ lcv = kh.f;
+ do {
+ db_read_bytes((db_addr_t)&kh.e[lcv], sizeof(ke), (char *)&ke);
+ if (ke.fmt) {
+ db_read_bytes((db_addr_t)ke.fmt, sizeof(fmt), fmt);
+ db_read_bytes((db_addr_t)ke.fn, sizeof(fn), fn);
+ fmt[sizeof(fmt) - 1] = '\0';
+ fn[sizeof(fmt) - 1] = '\0';
+ ke.fmt = fmt;
+ ke.fn = fn;
+ kernhist_entry_print(&ke);
+ }
+ lcv = (lcv + 1) % kh.n;
+ } while (lcv != kh.f);
+}
+
+void
+kernhist_print(void (*pr)(const char *, ...))
+{
+ struct kern_history_head khh;
+
+ if (nl[X_KERN_HISTORIES].n_value == 0) {
+ warnx("kernhist is not available");
+ return;
+ }
+
+ db_read_bytes(nl[X_KERN_HISTORIES].n_value, sizeof(khh), (char *)&khh);
+
+ kernhist_dump(LIST_FIRST(&khh));
+}
+
__dead static void
usage(void)
{
Index: src/usr.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.47 src/usr.sbin/makefs/cd9660.c:1.48
--- src/usr.sbin/makefs/cd9660.c:1.47 Thu Oct 24 10:01:01 2013
+++ src/usr.sbin/makefs/cd9660.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.47 2013/10/24 14:01:01 apb Exp $ */
+/* $NetBSD: cd9660.c,v 1.48 2015/06/16 23:04:14 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.47 2013/10/24 14:01:01 apb Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.48 2015/06/16 23:04:14 christos Exp $");
#endif /* !__lint */
#include <string.h>
@@ -381,7 +381,7 @@ cd9660_parse_opts(const char *option, fs
assert(option != NULL);
if (debug & DEBUG_FS_PARSE_OPTS)
- printf("cd9660_parse_opts: got `%s'\n", option);
+ printf("%s: got `%s'\n", __func__, option);
i = set_option(cd9660_options, option, buf, sizeof(buf));
if (i == -1)
@@ -442,7 +442,7 @@ cd9660_parse_opts(const char *option, fs
*/
if (buf[0] == '\0') {
warnx("The Boot Image Directory parameter"
- " requires a directory name\n");
+ " requires a directory name");
rv = 0;
} else {
diskStructure->boot_image_directory =
@@ -495,11 +495,11 @@ cd9660_makefs(const char *image, const c
iso9660_disk *diskStructure = fsopts->fs_specific;
if (diskStructure->verbose_level > 0)
- printf("cd9660_makefs: ISO level is %i\n",
+ printf("%s: ISO level is %i\n", __func__,
diskStructure->isoLevel);
if (diskStructure->isoLevel < 2 &&
diskStructure->allow_multidot)
- errx(1, "allow-multidot requires iso level of 2\n");
+ errx(1, "allow-multidot requires iso level of 2");
assert(image != NULL);
assert(dir != NULL);
@@ -514,7 +514,7 @@ cd9660_makefs(const char *image, const c
}
if (diskStructure->verbose_level > 0)
- printf("cd9660_makefs: image %s directory %s root %p\n",
+ printf("%s: image %s directory %s root %p\n", __func__,
image, dir, root);
/* Set up some constants. Later, these will be defined with options */
@@ -540,13 +540,13 @@ cd9660_makefs(const char *image, const c
&numDirectories, &error);
if (TAILQ_EMPTY(&real_root->cn_children)) {
- errx(1, "cd9660_makefs: converted directory is empty. "
- "Tree conversion failed\n");
+ errx(1, "%s: converted directory is empty. ", __func__,
+ "Tree conversion failed");
} else if (error != 0) {
- errx(1, "cd9660_makefs: tree conversion failed\n");
+ errx(1, "cd9660_makefs: tree conversion failed");
} else {
if (diskStructure->verbose_level > 0)
- printf("cd9660_makefs: tree converted\n");
+ printf("%s: tree converted\n", __func__);
}
/* Add the dot and dot dot records */
@@ -555,7 +555,7 @@ cd9660_makefs(const char *image, const c
cd9660_setup_root_node(diskStructure);
if (diskStructure->verbose_level > 0)
- printf("cd9660_makefs: done converting tree\n");
+ printf("%s: done converting tree\n", __func__);
/* non-SUSP extensions */
if (diskStructure->archimedes_enabled)
@@ -593,8 +593,9 @@ cd9660_makefs(const char *image, const c
diskStructure->dataFirstSector =
diskStructure->primaryBigEndianTableSector + pathTableSectors;
if (diskStructure->verbose_level > 0)
- printf("cd9660_makefs: Path table conversion complete. "
- "Each table is %i bytes, or %" PRIu64 " sectors.\n",
+ printf("%s: Path table conversion complete. "
+ "Each table is %i bytes, or %" PRIu64 " sectors.\n",
+ __func__,
diskStructure->pathTableLength, pathTableSectors);
startoffset = diskStructure->sectorSize*diskStructure->dataFirstSector;
@@ -622,13 +623,14 @@ cd9660_makefs(const char *image, const c
/* Debugging output */
if (diskStructure->verbose_level > 0) {
- printf("cd9660_makefs: Sectors 0-15 reserved\n");
- printf("cd9660_makefs: Primary path tables starts in sector %"
- PRId64 "\n", diskStructure->primaryLittleEndianTableSector);
- printf("cd9660_makefs: File data starts in sector %"
- PRId64 "\n", diskStructure->dataFirstSector);
- printf("cd9660_makefs: Total sectors: %"
- PRId64 "\n", diskStructure->totalSectors);
+ printf("%s: Sectors 0-15 reserved\n", __func__);
+ printf("%s: Primary path tables starts in sector %"
+ PRId64 "\n", __func__,
+ diskStructure->primaryLittleEndianTableSector);
+ printf("%s: File data starts in sector %"
+ PRId64 "\n", __func__, diskStructure->dataFirstSector);
+ printf("%s: Total sectors: %"
+ PRId64 "\n", __func__, diskStructure->totalSectors);
}
/*
@@ -650,7 +652,7 @@ cd9660_makefs(const char *image, const c
cd9660_free_structure(real_root);
if (diskStructure->verbose_level > 0)
- printf("cd9660_makefs: done\n");
+ printf("%s: done\n", __func__);
}
/* Generic function pointer - implement later */
@@ -866,8 +868,7 @@ cd9660_translate_node(iso9660_disk *disk
{
if (node == NULL) {
if (diskStructure->verbose_level > 0)
- printf("cd9660_translate_node: NULL node passed, "
- "returning\n");
+ printf("%s: NULL node passed, returning\n", __func__);
return 0;
}
newnode->isoDirRecord = emalloc(sizeof(*newnode->isoDirRecord));
@@ -1245,7 +1246,7 @@ cd9660_count_collisions(cd9660node *copy
}
#if 0
if ((next = TAILQ_NEXT(iter, cn_next_child)) != NULL) {
- printf("cd9660_recurse_on_collision: count is %i \n", count);
+ printf("%s: count is %i \n", __func__, count);
compare = cd9660_compare_filename(iter->isoDirRecord->name,
next->isoDirRecord->name);
if (compare == 0) {
@@ -1366,7 +1367,7 @@ cd9660_convert_structure(iso9660_disk *d
* Newer, more efficient method, reduces recursion depth
*/
if (root == NULL) {
- warnx("%s: root is null\n", __func__);
+ warnx("%s: root is null", __func__);
return;
}
Index: src/usr.sbin/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.16 src/usr.sbin/makefs/udf.c:1.17
--- src/usr.sbin/makefs/udf.c:1.16 Thu Dec 19 18:00:50 2013
+++ src/usr.sbin/makefs/udf.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.16 2013/12/19 23:00:50 joerg Exp $ */
+/* $NetBSD: udf.c,v 1.17 2015/06/16 23:04:14 christos Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf.c,v 1.16 2013/12/19 23:00:50 joerg Exp $");
+__RCSID("$NetBSD: udf.c,v 1.17 2015/06/16 23:04:14 christos Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -995,7 +995,7 @@ udf_copy_file(struct stat *st, char *pat
while (chunk) {
rd = read(f, data, chunk);
if (rd != chunk) {
- warn("Short read of file %s\n", cur->name);
+ warn("Short read of file %s", cur->name);
error = errno;
break;
}
Index: src/usr.sbin/ndiscvt/ndiscvt.c
diff -u src/usr.sbin/ndiscvt/ndiscvt.c:1.11 src/usr.sbin/ndiscvt/ndiscvt.c:1.12
--- src/usr.sbin/ndiscvt/ndiscvt.c:1.11 Thu Nov 7 20:10:23 2013
+++ src/usr.sbin/ndiscvt/ndiscvt.c Tue Jun 16 19:04:14 2015
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/usr.sbin/ndiscvt/ndiscvt.c,v 1.9.2.2 2005/02/23 16:31:47 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__RCSID("$NetBSD: ndiscvt.c,v 1.11 2013/11/08 01:10:23 christos Exp $");
+__RCSID("$NetBSD: ndiscvt.c,v 1.12 2015/06/16 23:04:14 christos Exp $");
#endif
@@ -361,8 +361,7 @@ main(int argc, char *argv[])
fp = NULL;
if (insert_padding(&img, &fsize)) {
- fprintf(stderr, "section relocation failed\n");
- exit(1);
+ errx(1, "section relocation failed");
}
if (outfile == NULL || strcmp(outfile, "-") == 0)
Index: src/usr.sbin/ndp/ndp.c
diff -u src/usr.sbin/ndp/ndp.c:1.43 src/usr.sbin/ndp/ndp.c:1.44
--- src/usr.sbin/ndp/ndp.c:1.43 Thu Jun 5 12:06:49 2014
+++ src/usr.sbin/ndp/ndp.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ndp.c,v 1.43 2014/06/05 16:06:49 roy Exp $ */
+/* $NetBSD: ndp.c,v 1.44 2015/06/16 23:04:14 christos Exp $ */
/* $KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $ */
/*
@@ -353,7 +353,7 @@ set(int argc, char **argv)
hints.ai_family = AF_INET6;
gai_error = getaddrinfo(host, NULL, &hints, &res);
if (gai_error) {
- warnx("%s: %s\n", host, gai_strerror(gai_error));
+ warnx("%s: %s", host, gai_strerror(gai_error));
return 1;
}
mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
@@ -420,7 +420,7 @@ get(char *host)
hints.ai_family = AF_INET6;
gai_error = getaddrinfo(host, NULL, &hints, &res);
if (gai_error) {
- warnx("%s: %s\n", host, gai_strerror(gai_error));
+ warnx("%s: %s", host, gai_strerror(gai_error));
return;
}
mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
@@ -454,7 +454,7 @@ delete(char *host)
hints.ai_family = AF_INET6;
gai_error = getaddrinfo(host, NULL, &hints, &res);
if (gai_error) {
- warnx("%s: %s\n", host, gai_strerror(gai_error));
+ warnx("%s: %s", host, gai_strerror(gai_error));
return 1;
}
mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
Index: src/usr.sbin/npf/npftest/npftest.c
diff -u src/usr.sbin/npf/npftest/npftest.c:1.17 src/usr.sbin/npf/npftest/npftest.c:1.18
--- src/usr.sbin/npf/npftest/npftest.c:1.17 Wed Feb 12 22:34:40 2014
+++ src/usr.sbin/npf/npftest/npftest.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npftest.c,v 1.17 2014/02/13 03:34:40 rmind Exp $ */
+/* $NetBSD: npftest.c,v 1.18 2015/06/16 23:04:14 christos Exp $ */
/*
* NPF testing framework.
@@ -115,7 +115,7 @@ load_npf_config(const char *config)
/* Pass the XML configuration for NPF kernel component to load. */
error = rumpns_npf_test_load(xml);
if (error) {
- errx(EXIT_FAILURE, "npf_test_load: %s\n", strerror(error));
+ errx(EXIT_FAILURE, "npf_test_load: %s", strerror(error));
}
free(xml);
Index: src/usr.sbin/pf/pfs/pfs.c
diff -u src/usr.sbin/pf/pfs/pfs.c:1.1 src/usr.sbin/pf/pfs/pfs.c:1.2
--- src/usr.sbin/pf/pfs/pfs.c:1.1 Fri May 7 13:41:58 2010
+++ src/usr.sbin/pf/pfs/pfs.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pfs.c,v 1.1 2010/05/07 17:41:58 degroote Exp $ */
+/* $NetBSD: pfs.c,v 1.2 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pfs.c,v 1.1 2010/05/07 17:41:58 degroote Exp $");
+__RCSID("$NetBSD: pfs.c,v 1.2 2015/06/16 23:04:14 christos Exp $");
#endif
#include <sys/types.h>
@@ -370,7 +370,7 @@ dump_states_ascii(int fd, int verbose, c
} else {
f = fopen(filename, "w");
if (f == NULL)
- err(EXIT_FAILURE, "Can't open %s\n", filename);
+ err(EXIT_FAILURE, "Can't open %s", filename);
}
print_states(fd, verbose, f);
@@ -390,7 +390,7 @@ restore_states_ascii(int fd, int verbose
f = fopen(filename, "r");
if (f == NULL)
- err(EXIT_FAILURE, "Can't open %s\n", filename);
+ err(EXIT_FAILURE, "Can't open %s", filename);
parse(f, &ps);
@@ -428,7 +428,7 @@ test_ascii_dump(int verbose, const char*
f1 = fopen(file1, "r");
if (f1 == NULL)
- err(EXIT_FAILURE, "Can't open %s\n", file1);
+ err(EXIT_FAILURE, "Can't open %s", file1);
f2 = fopen(file2, "w");
@@ -436,7 +436,7 @@ test_ascii_dump(int verbose, const char*
errno_saved = errno;
fclose(f2);
errno = errno_saved;
- err(EXIT_FAILURE, "Can't open %s\n", file2);
+ err(EXIT_FAILURE, "Can't open %s", file2);
}
parse(f1, &ps);
Index: src/usr.sbin/quotacheck/quotacheck.c
diff -u src/usr.sbin/quotacheck/quotacheck.c:1.48 src/usr.sbin/quotacheck/quotacheck.c:1.49
--- src/usr.sbin/quotacheck/quotacheck.c:1.48 Sun Jun 23 03:28:37 2013
+++ src/usr.sbin/quotacheck/quotacheck.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: quotacheck.c,v 1.48 2013/06/23 07:28:37 dholland Exp $ */
+/* $NetBSD: quotacheck.c,v 1.49 2015/06/16 23:04:14 christos Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)quotacheck.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: quotacheck.c,v 1.48 2013/06/23 07:28:37 dholland Exp $");
+__RCSID("$NetBSD: quotacheck.c,v 1.49 2015/06/16 23:04:14 christos Exp $");
#endif
#endif /* not lint */
@@ -268,7 +268,7 @@ main(int argc, char *argv[])
endfsent();
for (i = 0; i < argc; i++)
if ((done & (1 << i)) == 0)
- warnx("%s not found in %s\n", argv[i], FSTAB);
+ warnx("%s not found in %s", argv[i], FSTAB);
return errs;
}
Index: src/usr.sbin/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.44 src/usr.sbin/repquota/repquota.c:1.45
--- src/usr.sbin/repquota/repquota.c:1.44 Sat May 12 15:47:26 2012
+++ src/usr.sbin/repquota/repquota.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: repquota.c,v 1.44 2012/05/12 19:47:26 dholland Exp $ */
+/* $NetBSD: repquota.c,v 1.45 2015/06/16 23:04:14 christos Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)repquota.c 8.2 (Berkeley) 11/22/94";
#else
-__RCSID("$NetBSD: repquota.c,v 1.44 2012/05/12 19:47:26 dholland Exp $");
+__RCSID("$NetBSD: repquota.c,v 1.45 2015/06/16 23:04:14 christos Exp $");
#endif
#endif /* not lint */
@@ -522,7 +522,7 @@ addid(uint32_t id, int idtype, const cha
name = pw->pw_name;
break;
default:
- errx(1, "Unknown quota ID type %d\n", idtype);
+ errx(1, "Unknown quota ID type %d", idtype);
}
}
Index: src/usr.sbin/timed/timed/timed.c
diff -u src/usr.sbin/timed/timed/timed.c:1.24 src/usr.sbin/timed/timed/timed.c:1.25
--- src/usr.sbin/timed/timed/timed.c:1.24 Mon Jul 21 09:36:59 2008
+++ src/usr.sbin/timed/timed/timed.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: timed.c,v 1.24 2008/07/21 13:36:59 lukem Exp $ */
+/* $NetBSD: timed.c,v 1.25 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 19
#if 0
static char sccsid[] = "@(#)timed.c 8.2 (Berkeley) 3/26/95";
#else
-__RCSID("$NetBSD: timed.c,v 1.24 2008/07/21 13:36:59 lukem Exp $");
+__RCSID("$NetBSD: timed.c,v 1.25 2015/06/16 23:04:14 christos Exp $");
#endif
#endif /* not lint */
@@ -186,7 +186,7 @@ main(int argc, char *argv[])
break;
case 'G':
if (goodgroup != 0)
- errx(EXIT_FAILURE, "timed: only one net group\n");
+ errx(EXIT_FAILURE, "timed: only one net group");
goodgroup = optarg;
break;
default:
@@ -219,7 +219,7 @@ main(int argc, char *argv[])
srvp = getservbyname("timed", "udp");
if (srvp == NULL)
- errx(EXIT_FAILURE, "unknown service 'timed/udp'\n");
+ errx(EXIT_FAILURE, "unknown service 'timed/udp'");
port = srvp->s_port;
(void)memset(&server, 0, sizeof(server));
@@ -234,7 +234,7 @@ main(int argc, char *argv[])
if (bind(sock, (struct sockaddr*)(void *)&server, sizeof(server))) {
if (errno == EADDRINUSE)
- errx(EXIT_FAILURE, "time daemon already running\n");
+ errx(EXIT_FAILURE, "time daemon already running");
else
err(EXIT_FAILURE, "bind");
}
@@ -260,11 +260,11 @@ main(int argc, char *argv[])
if (nentp != 0)
nt->net = nentp->n_net;
else if (nt->net == INADDR_NONE)
- errx(EXIT_FAILURE, "unknown net %s\n", nt->name);
+ errx(EXIT_FAILURE, "unknown net %s", nt->name);
else if (nt->net == INADDR_ANY)
- errx(EXIT_FAILURE, "bad net %s\n", nt->name);
+ errx(EXIT_FAILURE, "bad net %s", nt->name);
else
- warnx("warning: %s unknown in /etc/networks\n",
+ warnx("warning: %s unknown in /etc/networks",
nt->name);
if (0 == (nt->net & 0xff000000))
@@ -330,7 +330,7 @@ main(int argc, char *argv[])
if (ntp)
(void) free(ntp);
if (nettab == NULL)
- errx(EXIT_FAILURE, "no network usable\n");
+ errx(EXIT_FAILURE, "no network usable");
/* microseconds to delay before responding to a broadcast */
@@ -685,7 +685,7 @@ addnetname(char *name)
netlist = &((*netlist)->next);
*netlist = calloc(1, sizeof **netlist);
if (*netlist == NULL)
- err(EXIT_FAILURE, "malloc failed\n");
+ err(EXIT_FAILURE, "malloc failed");
(*netlist)->name = name;
}
@@ -710,7 +710,7 @@ add_good_host(const char* name,
hentp = gethostbyname(name);
if (NULL == hentp && perm)
- (void)warnx("unknown host %s\n", name);
+ warnx("unknown host %s", name);
}
