summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lo <kevlo@FreeBSD.org>2012-05-21 02:30:22 +0000
committerKevin Lo <kevlo@FreeBSD.org>2012-05-21 02:30:22 +0000
commitf529372e8ad7fda51e32f546cd245f378a1b80e2 (patch)
treef852dff7a52a3624db01ac48e4990a03631ad3e0
parentbc6f23e0ad548f2493d503fc7ad86ebed1e2735b (diff)
Notes
-rw-r--r--sys/libkern/iconv.c4
-rw-r--r--sys/sys/iconv.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index 92b04c2864e6..e03d8ca05ea0 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -549,9 +549,7 @@ int
iconv_lookupcp(char **cpp, const char *s)
{
if (cpp == NULL) {
- ICDEBUG("warning a NULL list passed\n", ""); /* XXX ISO variadic macros cannot
- leave out the
- variadic args */
+ ICDEBUG("warning a NULL list passed\n", "");
return ENOENT;
}
for (; *cpp; cpp++)
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h
index 671b24e1479b..5e59795b6c71 100644
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
@@ -240,7 +240,7 @@ int iconv_converter_tolowerstub(int c, void *handle);
int iconv_converter_handler(module_t mod, int type, void *data);
#ifdef ICONV_DEBUG
-#define ICDEBUG(format, ...) printf("%s: "format, __func__ , __VA_ARGS__)
+#define ICDEBUG(format, ...) printf("%s: "format, __func__ , ## __VA_ARGS__)
#else
#define ICDEBUG(format, ...)
#endif