From owner-svn-src-all@FreeBSD.ORG Mon May 21 02:30:23 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58A74106564A; Mon, 21 May 2012 02:30:23 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4354E8FC12; Mon, 21 May 2012 02:30:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4L2UNna031813; Mon, 21 May 2012 02:30:23 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4L2UN5b031810; Mon, 21 May 2012 02:30:23 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201205210230.q4L2UN5b031810@svn.freebsd.org> From: Kevin Lo Date: Mon, 21 May 2012 02:30:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235711 - in head/sys: libkern sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2012 02:30:23 -0000 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