diff options
author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-07-21 16:38:56 +0000 |
---|---|---|
committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-07-21 16:38:56 +0000 |
commit | a8b5a1b7407513fb795e4facf3a843d2b4a5767b (patch) | |
tree | 61314abee87c896f4451db7397c5e56451b79e4c | |
parent | b7e718c998a175fbefa2656dc922e97a91527f80 (diff) |
remove trailing newlines from err(3) calls; millert@ and matthieu@ ok.
-rw-r--r-- | sbin/badsect/badsect.c | 6 | ||||
-rw-r--r-- | usr.sbin/acpidump/acpi.c | 8 | ||||
-rw-r--r-- | usr.sbin/acpidump/acpi_user.c | 10 | ||||
-rw-r--r-- | usr.sbin/acpidump/acpidump.c | 8 | ||||
-rw-r--r-- | usr.sbin/acpidump/asl_dump.c | 8 | ||||
-rw-r--r-- | usr.sbin/ztsscale/ztsscale.c | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index 8e6a55cf434..258b2fe2d6c 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: badsect.c,v 1.14 2004/08/08 19:04:25 deraadt Exp $ */ +/* $OpenBSD: badsect.c,v 1.15 2005/07/21 16:38:54 fgsch Exp $ */ /* $NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $ */ /* @@ -40,7 +40,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: badsect.c,v 1.14 2004/08/08 19:04:25 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: badsect.c,v 1.15 2005/07/21 16:38:54 fgsch Exp $"; #endif #endif /* not lint */ @@ -130,7 +130,7 @@ main(int argc, char *argv[]) strlcpy(&name[len+1], dp->d_name, sizeof name - (len+1)); closedir(dirp); if (dp == NULL) - err(5, "Cannot find dev 0%o corresponding to %s\n", + err(5, "Cannot find dev 0%o corresponding to %s", stbuf.st_rdev, argv[1]); if ((fsi = open(name, 0)) < 0) diff --git a/usr.sbin/acpidump/acpi.c b/usr.sbin/acpidump/acpi.c index 50eed086eaa..d350444372a 100644 --- a/usr.sbin/acpidump/acpi.c +++ b/usr.sbin/acpidump/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.2 2005/06/04 02:25:53 cloder Exp $ */ +/* $OpenBSD: acpi.c,v 1.3 2005/07/21 16:38:55 fgsch Exp $ */ /*- * Copyright (c) 1998 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: acpi.c,v 1.2 2005/06/04 02:25:53 cloder Exp $ + * $Id: acpi.c,v 1.3 2005/07/21 16:38:55 fgsch Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.3 2000/11/08 02:37:00 iwasaki Exp $ */ #include <sys/types.h> @@ -122,7 +122,7 @@ acpi_handle_facp(struct FACPbody *facp) acpi_print_facp(facp); dsdp = (struct ACPIsdt *) acpi_map_sdt(facp->dsdt_ptr); if (acpi_checksum(dsdp, dsdp->len)) - errx(1, "DSDT is corrupt\n"); + errx(1, "DSDT is corrupt"); acpi_handle_dsdt(dsdp); aml_dump(dsdp); } @@ -348,7 +348,7 @@ acpi_handle_rsdt(struct ACPIsdt *rsdp) for (i = 0; i < entries; i++) { sdp = (struct ACPIsdt *) acpi_map_sdt(rsdp->body[i]); if (acpi_checksum(sdp, sdp->len)) - errx(1, "RSDT entry %d is corrupt\n", i); + errx(1, "RSDT entry %d is corrupt", i); if (!memcmp(sdp->signature, "FACP", 4)) { acpi_handle_facp((struct FACPbody *) sdp->body); } else { diff --git a/usr.sbin/acpidump/acpi_user.c b/usr.sbin/acpidump/acpi_user.c index bd924fa4393..14a495d013b 100644 --- a/usr.sbin/acpidump/acpi_user.c +++ b/usr.sbin/acpidump/acpi_user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_user.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: acpi_user.c,v 1.2 2005/07/21 16:38:55 fgsch Exp $ */ /*- * Copyright (c) 1999 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: acpi_user.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ + * $Id: acpi_user.c,v 1.2 2005/07/21 16:38:55 fgsch Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/acpi_user.c,v 1.3 2000/11/08 02:37:00 iwasaki Exp $ */ #ifdef __FreeBSD__ @@ -143,18 +143,18 @@ acpi_load_dsdt(char *dumpfile, u_int8_t **dpp, u_int8_t **endp) struct stat sb; if ((acpi_mem_fd = open(dumpfile, O_RDONLY)) == -1) { - errx(1, "opening %s\n", dumpfile); + errx(1, "opening %s", dumpfile); } LIST_INIT(&maplist); if (fstat(acpi_mem_fd, &sb) == -1) { - errx(1, "fstat %s\n", dumpfile); + errx(1, "fstat %s", dumpfile); } dp = mmap(0, sb.st_size, PROT_READ, MAP_PRIVATE, acpi_mem_fd, 0); if (dp == NULL) { - errx(1, "mmap %s\n", dumpfile); + errx(1, "mmap %s", dumpfile); } if (strncmp(dp, "DSDT", 4) == 0) { diff --git a/usr.sbin/acpidump/acpidump.c b/usr.sbin/acpidump/acpidump.c index 82c562efc32..e693b07a4e5 100644 --- a/usr.sbin/acpidump/acpidump.c +++ b/usr.sbin/acpidump/acpidump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpidump.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: acpidump.c,v 1.2 2005/07/21 16:38:55 fgsch Exp $ */ /*- * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> * All rights reserved. @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: acpidump.c,v 1.1 2005/06/02 20:09:39 tholo Exp $ + * $Id: acpidump.c,v 1.2 2005/07/21 16:38:55 fgsch Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/acpidump.c,v 1.3 2000/11/08 02:37:00 iwasaki Exp $ */ @@ -56,13 +56,13 @@ asl_dump_from_devmem() rp = acpi_find_rsd_ptr(); if (!rp) - errx(1, "Can't find ACPI information\n"); + errx(1, "Can't find ACPI information"); acpi_print_rsd_ptr(rp); rsdp = (struct ACPIsdt *) acpi_map_sdt(rp->addr); if (memcmp(rsdp->signature, "RSDT", 4) || acpi_checksum(rsdp, rsdp->len)) - errx(1, "RSDT is corrupted\n"); + errx(1, "RSDT is corrupted"); acpi_handle_rsdt(rsdp); } diff --git a/usr.sbin/acpidump/asl_dump.c b/usr.sbin/acpidump/asl_dump.c index d102ce6bb5b..0fe1f57dba3 100644 --- a/usr.sbin/acpidump/asl_dump.c +++ b/usr.sbin/acpidump/asl_dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asl_dump.c,v 1.2 2005/06/04 02:25:53 cloder Exp $ */ +/* $OpenBSD: asl_dump.c,v 1.3 2005/07/21 16:38:55 fgsch Exp $ */ /*- * Copyright (c) 1999 Doug Rabson * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org> @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asl_dump.c,v 1.2 2005/06/04 02:25:53 cloder Exp $ + * $Id: asl_dump.c,v 1.3 2005/07/21 16:38:55 fgsch Exp $ * $FreeBSD: src/usr.sbin/acpi/acpidump/asl_dump.c,v 1.5 2001/10/23 14:53:58 takawata Exp $ */ @@ -990,7 +990,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent) asl_dump_defbankfield(&dp, indent); break; default: - errx(1, "strange opcode 0x5b, 0x%x\n", opcode); + errx(1, "strange opcode 0x5b, 0x%x", opcode); } break; case 0x68 ... 0x6e: /* ArgN */ @@ -1284,7 +1284,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent) printf("BreakPoint"); break; default: - errx(1, "strange opcode 0x%x\n", opcode); + errx(1, "strange opcode 0x%x", opcode); } *dpp = dp; diff --git a/usr.sbin/ztsscale/ztsscale.c b/usr.sbin/ztsscale/ztsscale.c index 2b723421891..a76723ef75a 100644 --- a/usr.sbin/ztsscale/ztsscale.c +++ b/usr.sbin/ztsscale/ztsscale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ztsscale.c,v 1.10 2005/04/28 17:01:40 uwe Exp $ */ +/* $OpenBSD: ztsscale.c,v 1.11 2005/07/21 16:38:55 fgsch Exp $ */ /* * Copyright (c) 2005 Matthieu Herrb @@ -133,7 +133,7 @@ save_screen(void) int mode = WSDISPLAYIO_MODE_DUMBFB; if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) == -1) - warn("ioctl SMODE\n"); + warn("ioctl SMODE"); mapaddr = (void *)mmap(0, WIDTH*HEIGHT*sizeof(short), PROT_READ|PROT_WRITE, MAP_SHARED, fd, (off_t)0); if (mapaddr == (void *)-1) |