Module Name: src
Committed By: wiz
Date: Tue Jan 4 09:04:24 UTC 2011
Modified Files:
src/usr.sbin/fwctl: fwdv.c fwmpegts.c
Log Message:
Use format string for err(). From Henning Petersen in PR 44326.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fwctl/fwdv.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fwctl/fwmpegts.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.sbin/fwctl/fwdv.c
diff -u src/usr.sbin/fwctl/fwdv.c:1.4 src/usr.sbin/fwctl/fwdv.c:1.5
--- src/usr.sbin/fwctl/fwdv.c:1.4 Tue Aug 24 08:41:24 2010
+++ src/usr.sbin/fwctl/fwdv.c Tue Jan 4 09:04:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdv.c,v 1.4 2010/08/24 08:41:24 cegger Exp $ */
+/* $NetBSD: fwdv.c,v 1.5 2011/01/04 09:04:24 wiz Exp $ */
/*
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -107,7 +107,7 @@
} else {
fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0660);
if (fd == -1)
- err(EX_NOINPUT, filename);
+ err(EX_NOINPUT, "%s", filename);
}
buf = malloc(RBUFSIZE);
pad = malloc(DSIZE*MAXBLOCKS);
@@ -269,7 +269,7 @@
fd = open(filename, O_RDONLY);
if (fd == -1)
- err(EX_NOINPUT, filename);
+ err(EX_NOINPUT, "%s", filename);
pbuf = malloc(DSIZE * TNBUF);
bzero(wbuf, sizeof(wbuf));
Index: src/usr.sbin/fwctl/fwmpegts.c
diff -u src/usr.sbin/fwctl/fwmpegts.c:1.2 src/usr.sbin/fwctl/fwmpegts.c:1.3
--- src/usr.sbin/fwctl/fwmpegts.c:1.2 Tue Aug 24 08:41:24 2010
+++ src/usr.sbin/fwctl/fwmpegts.c Tue Jan 4 09:04:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwmpegts.c,v 1.2 2010/08/24 08:41:24 cegger Exp $ */
+/* $NetBSD: fwmpegts.c,v 1.3 2011/01/04 09:04:24 wiz Exp $ */
/*
* Copyright (C) 2005
* Petr Holub, Hidetoshi Shimokawa. All rights reserved.
@@ -156,7 +156,7 @@
else {
fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0660);
if (fd == -1)
- err(EX_NOINPUT, filename);
+ err(EX_NOINPUT, "%s", filename);
}
buf = malloc(RBUFSIZE);
