Module Name: src Committed By: christos Date: Tue Jun 16 23:58:30 UTC 2015
Modified Files: src/sbin/fdisk: fdisk.c src/sbin/fsck_ffs: main.c src/sbin/fsck_lfs: pass2.c utilities.c Log Message: a few more \n's in errors To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sbin/fdisk/fdisk.c cvs rdiff -u -r1.82 -r1.83 src/sbin/fsck_ffs/main.c cvs rdiff -u -r1.24 -r1.25 src/sbin/fsck_lfs/pass2.c cvs rdiff -u -r1.36 -r1.37 src/sbin/fsck_lfs/utilities.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sbin/fdisk/fdisk.c diff -u src/sbin/fdisk/fdisk.c:1.151 src/sbin/fdisk/fdisk.c:1.152 --- src/sbin/fdisk/fdisk.c:1.151 Tue Jun 16 19:18:54 2015 +++ src/sbin/fdisk/fdisk.c Tue Jun 16 19:58:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: fdisk.c,v 1.151 2015/06/16 23:18:54 christos Exp $ */ +/* $NetBSD: fdisk.c,v 1.152 2015/06/16 23:58:30 christos Exp $ */ /* * Mach Operating System @@ -39,7 +39,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: fdisk.c,v 1.151 2015/06/16 23:18:54 christos Exp $"); +__RCSID("$NetBSD: fdisk.c,v 1.152 2015/06/16 23:58:30 christos Exp $"); #endif /* not lint */ #define MBRPTYPENAMES @@ -1200,7 +1200,7 @@ get_extended_ptn(void) break; } - warnx("Extended partition table is corrupt\n"); + warnx("Extended partition table is corrupt"); ext.is_corrupt = 1; ext.num_ptn = 0; } Index: src/sbin/fsck_ffs/main.c diff -u src/sbin/fsck_ffs/main.c:1.82 src/sbin/fsck_ffs/main.c:1.83 --- src/sbin/fsck_ffs/main.c:1.82 Tue Jun 16 19:18:55 2015 +++ src/sbin/fsck_ffs/main.c Tue Jun 16 19:58:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.82 2015/06/16 23:18:55 christos Exp $ */ +/* $NetBSD: main.c,v 1.83 2015/06/16 23:58:30 christos Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; #else -__RCSID("$NetBSD: main.c,v 1.82 2015/06/16 23:18:55 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.83 2015/06/16 23:58:30 christos Exp $"); #endif #endif /* not lint */ @@ -123,7 +123,7 @@ main(int argc, char *argv[]) cvtlevel = argtoi('c', "conversion level", optarg, 10); if (cvtlevel > 4) { cvtlevel = 4; - warnx("Using maximum conversion level of %d\n", + warnx("Using maximum conversion level of %d", cvtlevel); } break; Index: src/sbin/fsck_lfs/pass2.c diff -u src/sbin/fsck_lfs/pass2.c:1.24 src/sbin/fsck_lfs/pass2.c:1.25 --- src/sbin/fsck_lfs/pass2.c:1.24 Tue Jun 16 19:18:55 2015 +++ src/sbin/fsck_lfs/pass2.c Tue Jun 16 19:58:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pass2.c,v 1.24 2015/06/16 23:18:55 christos Exp $ */ +/* $NetBSD: pass2.c,v 1.25 2015/06/16 23:58:30 christos Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -74,7 +74,7 @@ pass2(void) if (reply("ALLOCATE") == 0) err(EEXIT, "%s", ""); if (allocdir(ULFS_ROOTINO, ULFS_ROOTINO, 0755) != ULFS_ROOTINO) - err(EEXIT, "CANNOT ALLOCATE ROOT INODE\n"); + err(EEXIT, "CANNOT ALLOCATE ROOT INODE"); break; case DCLEAR: Index: src/sbin/fsck_lfs/utilities.c diff -u src/sbin/fsck_lfs/utilities.c:1.36 src/sbin/fsck_lfs/utilities.c:1.37 --- src/sbin/fsck_lfs/utilities.c:1.36 Tue Jun 16 19:18:55 2015 +++ src/sbin/fsck_lfs/utilities.c Tue Jun 16 19:58:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: utilities.c,v 1.36 2015/06/16 23:18:55 christos Exp $ */ +/* $NetBSD: utilities.c,v 1.37 2015/06/16 23:58:30 christos Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -274,7 +274,7 @@ dofix(struct inodesc * idesc, const char return (0); default: - err(EEXIT, "UNKNOWN INODESC FIX MODE %d\n", idesc->id_fix); + err(EEXIT, "UNKNOWN INODESC FIX MODE %d", idesc->id_fix); } /* NOTREACHED */ }