Module Name: src
Committed By: christos
Date: Wed Jun 17 00:01:59 UTC 2015
Modified Files:
src/usr.bin/cdplay: cdplay.c
src/usr.bin/chpass: pw_yp.c
src/usr.bin/kdump: kdump.c
Log Message:
more stray \n
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/cdplay/cdplay.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/chpass/pw_yp.c
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/kdump/kdump.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.bin/cdplay/cdplay.c
diff -u src/usr.bin/cdplay/cdplay.c:1.48 src/usr.bin/cdplay/cdplay.c:1.49
--- src/usr.bin/cdplay/cdplay.c:1.48 Mon Oct 7 11:17:24 2013
+++ src/usr.bin/cdplay/cdplay.c Tue Jun 16 20:01:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cdplay.c,v 1.48 2013/10/07 15:17:24 christos Exp $ */
+/* $NetBSD: cdplay.c,v 1.49 2015/06/17 00:01:59 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: cdplay.c,v 1.48 2013/10/07 15:17:24 christos Exp $");
+__RCSID("$NetBSD: cdplay.c,v 1.49 2015/06/17 00:01:59 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -306,7 +306,7 @@ main(int argc, char **argv)
}
} else {
cmd = CMD_QUIT;
- warnx("\r\n");
+ fprintf(stderr, "\r\n");
arg = NULL;
break;
}
@@ -1463,7 +1463,7 @@ readaudio(int afd, int lba, int blocks,
rc = ioctl(afd, SCIOCCOMMAND, &sc);
if (rc < 0 || sc.retsts != SCCMD_OK) {
if (da.read_errors < 10) {
- warnx("scsi cmd failed: retsts %d status %d\n",
+ warnx("scsi cmd failed: retsts %d status %d",
sc.retsts, sc.status);
}
da.read_errors++;
Index: src/usr.bin/chpass/pw_yp.c
diff -u src/usr.bin/chpass/pw_yp.c:1.22 src/usr.bin/chpass/pw_yp.c:1.23
--- src/usr.bin/chpass/pw_yp.c:1.22 Sat Apr 11 08:10:02 2009
+++ src/usr.bin/chpass/pw_yp.c Tue Jun 16 20:01:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pw_yp.c,v 1.22 2009/04/11 12:10:02 lukem Exp $ */
+/* $NetBSD: pw_yp.c,v 1.23 2015/06/17 00:01:59 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -33,7 +33,7 @@
#if 0
static char sccsid[] = "@(#)pw_yp.c 1.0 2/2/93";
#else
-__RCSID("$NetBSD: pw_yp.c,v 1.22 2009/04/11 12:10:02 lukem Exp $");
+__RCSID("$NetBSD: pw_yp.c,v 1.23 2015/06/17 00:01:59 christos Exp $");
#endif
#endif /* not lint */
@@ -136,7 +136,7 @@ pw_yp(struct passwd *pw, uid_t ypuid)
*/
if ((rpcport = getrpcport(master, YPPASSWDPROG, YPPASSWDPROC_UPDATE,
IPPROTO_UDP)) == 0) {
- warnx("master YP server not running yppasswd daemon.\n\t%s\n",
+ warnx("master YP server not running yppasswd daemon.\n\t%s",
"Can't change password.");
return (1);
}
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.119 src/usr.bin/kdump/kdump.c:1.120
--- src/usr.bin/kdump/kdump.c:1.119 Tue Jun 16 18:54:10 2015
+++ src/usr.bin/kdump/kdump.c Tue Jun 16 20:01:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.120 2015/06/17 00:01:59 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.120 2015/06/17 00:01:59 christos Exp $");
#endif
#endif /* not lint */
@@ -997,7 +997,7 @@ ktrpsig(void *v, int len)
}
/*NOTREACHED*/
default:
- warnx("Unhandled size %d for ktrpsig\n", len);
+ warnx("Unhandled size %d for ktrpsig", len);
break;
}
}
