diff options
| author | kevlo <kevlo@FreeBSD.org> | 2012-05-21 02:30:22 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2012-05-21 02:30:22 +0000 |
| commit | c50e4642a98f93c6d63ed6e3af62b00b1960dc38 (patch) | |
| tree | f852dff7a52a3624db01ac48e4990a03631ad3e0 | |
| parent | d6b2311f2355e04057ff108edde3b3efa24515e8 (diff) | |
| download | FreeBSD-src-c50e4642a98f93c6d63ed6e3af62b00b1960dc38.zip FreeBSD-src-c50e4642a98f93c6d63ed6e3af62b00b1960dc38.tar.gz | |
Fix improper handling of variadic args with ICDEBUG
PR: kern/168095
Submitted by: gcooper
| -rw-r--r-- | sys/libkern/iconv.c | 4 | ||||
| -rw-r--r-- | sys/sys/iconv.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c index 92b04c2..e03d8ca 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 671b24e..5e59795 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 |
