[src/netbsd-1-6]: src/usr.sbin/sunlabel Pull up revision 1.6 (requested by lu...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4caf07d7ad1b
branches:  netbsd-1-6
changeset: 529821:4caf07d7ad1b
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Dec 26 07:43:41 2002 +0000

description:
Pull up revision 1.6 (requested by lukem in ticket #1042):
sweep of errx/warnx, remove unnecessary trailing \n

diffstat:

 usr.sbin/sunlabel/sunlabel.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 2a8beb63f104 -r 4caf07d7ad1b usr.sbin/sunlabel/sunlabel.c
--- a/usr.sbin/sunlabel/sunlabel.c      Thu Dec 26 07:37:50 2002 +0000
+++ b/usr.sbin/sunlabel/sunlabel.c      Thu Dec 26 07:43:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunlabel.c,v 1.5 2002/05/16 09:55:50 wiz Exp $ */
+/* $NetBSD: sunlabel.c,v 1.5.2.1 2002/12/26 07:43:41 tron 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.5.2.1 2002/12/26 07:43:41 tron Exp $");
 
 #include <stdio.h>
 #include <errno.h>
@@ -580,7 +580,7 @@
 
        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 @@
                }
        }
        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 @@
                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;