Date: Mon, 21 May 2012 02:30:23 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235711 - in head/sys: libkern sys Message-ID: <201205210230.q4L2UN5b031810@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Mon May 21 02:30:22 2012 New Revision: 235711 URL: http://svn.freebsd.org/changeset/base/235711 Log: Fix improper handling of variadic args with ICDEBUG PR: kern/168095 Submitted by: gcooper Modified: head/sys/libkern/iconv.c head/sys/sys/iconv.h Modified: head/sys/libkern/iconv.c ============================================================================== --- head/sys/libkern/iconv.c Mon May 21 02:23:20 2012 (r235710) +++ head/sys/libkern/iconv.c Mon May 21 02:30:22 2012 (r235711) @@ -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++) Modified: head/sys/sys/iconv.h ============================================================================== --- head/sys/sys/iconv.h Mon May 21 02:23:20 2012 (r235710) +++ head/sys/sys/iconv.h Mon May 21 02:30:22 2012 (r235711) @@ -240,7 +240,7 @@ int iconv_converter_tolowerstub(int c, v 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205210230.q4L2UN5b031810>