CVS commit: src/usr.bin/config

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Tue Jun 16 21:12:19 UTC 2015

Modified Files:
        src/usr.bin/config: main.c scan.l

Log Message:
remove stray newlines from errors/warnings


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/config/main.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/config/scan.l

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/config/main.c
diff -u src/usr.bin/config/main.c:1.74 src/usr.bin/config/main.c:1.75
--- src/usr.bin/config/main.c:1.74	Thu Jan 22 15:01:22 2015
+++ src/usr.bin/config/main.c	Tue Jun 16 17:12:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.74 2015/01/22 20:01:22 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.75 2015/06/16 21:12:19 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.74 2015/01/22 20:01:22 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.75 2015/06/16 21:12:19 christos Exp $");
 
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
@@ -598,7 +598,7 @@ recreate(const char *p, const char *q)
 	int ret;
 
 	if ((ret = unlink(q)) == -1 && errno != ENOENT)
-		warn("unlink(%s)\n", q);
+		warn("unlink(%s)", q);
 	if ((ret = symlink(p, q)) == -1)
 		warn("symlink(%s -> %s)", q, p);
 	return ret;

Index: src/usr.bin/config/scan.l
diff -u src/usr.bin/config/scan.l:1.22 src/usr.bin/config/scan.l:1.23
--- src/usr.bin/config/scan.l:1.22	Fri Nov  7 12:50:14 2014
+++ src/usr.bin/config/scan.l	Tue Jun 16 17:12:19 2015
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: scan.l,v 1.22 2014/11/07 17:50:14 christos Exp $	*/
+/*	$NetBSD: scan.l,v 1.23 2015/06/16 21:12:19 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: scan.l,v 1.22 2014/11/07 17:50:14 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.23 2015/06/16 21:12:19 christos Exp $");
 
 #include <sys/param.h>
 #include <errno.h>
@@ -362,7 +362,7 @@ package[ \t]+{FILENAME}{RESTOFLINE}	{
 		/* Detect NUL characters in the config file and
 		 * error out.
 		 */
-		cfgerror("NUL character detected at line %i\n", yyline);
+		cfgerror("NUL character detected at line %i", yyline);
 	}
 #.*	{ /* ignored (comment) */; }
 [ \t]+	{ /* ignored (white space) */; }
@@ -505,7 +505,7 @@ include(const char *fname, int ateof, in
 		s = sourcepath(fname);
 	if ((fp = fopen(s, "r")) == NULL) {
 		if (conditional == 0)
-			cfgerror("cannot open %s for reading: %s\n", s,
+			cfgerror("cannot open %s for reading: %s", s,
 			    strerror(errno));
 		else if (vflag)
 			cfgwarn("cannot open conditional include file %s: %s",
@@ -514,7 +514,7 @@ include(const char *fname, int ateof, in
 		return (-1);
 	}
 	if (curdir_push(s) == -1) {
-		cfgerror("cannot record current working directory for %s\n", s);
+		cfgerror("cannot record current working directory for %s", s);
 		fclose(fp);
 		free(s);
 		return (-1);