Module Name: src
Committed By: christos
Date: Sun Aug 14 08:19:04 UTC 2011
Modified Files:
src/lib/libperfuse: Makefile perfuse_if.h
Log Message:
simplify and eliminate non literal string formats.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libperfuse/Makefile
cvs rdiff -u -r1.14 -r1.15 src/lib/libperfuse/perfuse_if.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/Makefile
diff -u src/lib/libperfuse/Makefile:1.7 src/lib/libperfuse/Makefile:1.8
--- src/lib/libperfuse/Makefile:1.7 Sat Aug 13 19:12:15 2011
+++ src/lib/libperfuse/Makefile Sun Aug 14 04:19:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/13 23:12:15 christos Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/14 08:19:04 christos Exp $
LIB= perfuse
LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs
@@ -16,8 +16,4 @@
INCS= perfuse.h
INCSDIR= /usr/include
-COPTS.ops.c = -Wno-format-nonliteral
-COPTS.perfuse.c = -Wno-format-nonliteral
-COPTS.subr.c = -Wno-format-nonliteral
-
.include <bsd.lib.mk>
Index: src/lib/libperfuse/perfuse_if.h
diff -u src/lib/libperfuse/perfuse_if.h:1.14 src/lib/libperfuse/perfuse_if.h:1.15
--- src/lib/libperfuse/perfuse_if.h:1.14 Sat Aug 13 19:12:15 2011
+++ src/lib/libperfuse/perfuse_if.h Sun Aug 14 04:19:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_if.h,v 1.14 2011/08/13 23:12:15 christos Exp $ */
+/* $NetBSD: perfuse_if.h,v 1.15 2011/08/14 08:19:04 christos Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -77,18 +77,15 @@
} while (0 /* CONSTCOND */)
#define DERR(status, fmt, ...) do { \
- char fmterr[BUFSIZ]; \
- char strerrbuf[BUFSIZ]; \
- \
- (void)strerror_r(errno, strerrbuf, sizeof(strerrbuf)); \
- (void)snprintf(fmterr, sizeof(fmterr), "%s: %s\n", fmt, \
- strerrbuf); \
- \
if (perfuse_diagflags & PDF_SYSLOG) \
- syslog(LOG_ERR, fmterr, ## __VA_ARGS__); \
+ syslog(LOG_ERR, fmt ": %m", ## __VA_ARGS__); \
\
if (perfuse_diagflags & PDF_FOREGROUND) { \
- (void)fprintf(stderr, fmterr, ## __VA_ARGS__); \
+ char strerrbuf[BUFSIZ]; \
+ \
+ (void)strerror_r(errno, strerrbuf, sizeof(strerrbuf)); \
+ (void)fprintf(stderr, fmt ": %s", ## __VA_ARGS__, \
+ strerrbuf); \
abort(); \
} else { \
err(status, fmt, ## __VA_ARGS__); \
@@ -104,14 +101,8 @@
#define DWARN(fmt, ...) do { \
\
- if (perfuse_diagflags & PDF_SYSLOG) { \
- char fmterr[BUFSIZ]; \
- char strerrbuf[BUFSIZ]; \
- \
- (void)strerror_r(errno, strerrbuf, sizeof(strerrbuf)); \
- (void)sprintf(fmterr, "%s: %s\n", fmt, strerrbuf); \
- syslog(LOG_WARNING, fmterr, ## __VA_ARGS__); \
- } \
+ if (perfuse_diagflags & PDF_SYSLOG) \
+ syslog(LOG_WARNING, fmt ": %m", ## __VA_ARGS__); \
\
warn(fmt, ## __VA_ARGS__); \
} while (0 /* CONSTCOND */)
