Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/config remove stray newlines from errors/warnings
details: https://anonhg.NetBSD.org/src/rev/c66ea21370b4
branches: trunk
changeset: 338910:c66ea21370b4
user: christos <christos%NetBSD.org@localhost>
date: Tue Jun 16 21:12:19 2015 +0000
description:
remove stray newlines from errors/warnings
diffstat:
usr.bin/config/main.c | 6 +++---
usr.bin/config/scan.l | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diffs (73 lines):
diff -r 421dc4b79ec7 -r c66ea21370b4 usr.bin/config/main.c
--- a/usr.bin/config/main.c Tue Jun 16 20:01:20 2015 +0000
+++ b/usr.bin/config/main.c Tue Jun 16 21:12:19 2015 +0000
@@ -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 @@
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;
diff -r 421dc4b79ec7 -r c66ea21370b4 usr.bin/config/scan.l
--- a/usr.bin/config/scan.l Tue Jun 16 20:01:20 2015 +0000
+++ b/usr.bin/config/scan.l Tue Jun 16 21:12:19 2015 +0000
@@ -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 @@
/* 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 @@
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 @@
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);
Home |
Main Index |
Thread Index |
Old Index