CVS commit: src/sys/dev/usb

[Iain Hibbert]

Module Name:    src
Committed By:   plunky
Date:           Wed Mar 16 21:36:55 UTC 2011

Modified Files:
        src/sys/dev/usb: ubt.c uhso.c

Log Message:
use C99 style for variadic macro arguments


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uhso.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.39 src/sys/dev/usb/ubt.c:1.40
--- src/sys/dev/usb/ubt.c:1.39	Wed Nov  3 22:34:23 2010
+++ src/sys/dev/usb/ubt.c	Wed Mar 16 21:36:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ubt.c,v 1.39 2010/11/03 22:34:23 dyoung Exp $	*/
+/*	$NetBSD: ubt.c,v 1.40 2011/03/16 21:36:55 plunky Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.39 2010/11/03 22:34:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.40 2011/03/16 21:36:55 plunky Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -97,14 +97,18 @@
 #ifdef UBT_DEBUG
 int	ubt_debug = 0;
 
-#define DPRINTF(fmt, args...)		do {		\
-	if (ubt_debug)					\
-		printf("%s: "fmt, __func__ , ##args);	\
+#define DPRINTF(...)		do {		\
+	if (ubt_debug) {			\
+		printf("%s: ", __func__);	\
+		printf(__VA_ARGS__);		\
+	}					\
 } while (/* CONSTCOND */0)
 
-#define DPRINTFN(n, fmt, args...)	do {		\
-	if (ubt_debug > (n))				\
-		printf("%s: "fmt, __func__ , ##args);	\
+#define DPRINTFN(n, ...)	do {		\
+	if (ubt_debug > (n)) {			\
+		printf("%s: ", __func__);	\
+		printf(__VA_ARGS__);		\
+	}					\
 } while (/* CONSTCOND */0)
 
 SYSCTL_SETUP(sysctl_hw_ubt_debug_setup, "sysctl hw.ubt_debug setup")

Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.3 src/sys/dev/usb/uhso.c:1.4
--- src/sys/dev/usb/uhso.c:1.3	Mon Nov 15 06:01:29 2010
+++ src/sys/dev/usb/uhso.c	Wed Mar 16 21:36:55 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhso.c,v 1.3 2010/11/15 06:01:29 uebayasi Exp $	*/
+/*	$NetBSD: uhso.c,v 1.4 2011/03/16 21:36:55 plunky Exp $	*/
 
 /*-
  * Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.3 2010/11/15 06:01:29 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.4 2011/03/16 21:36:55 plunky Exp $");
 
 #include "opt_inet.h"
 
@@ -87,9 +87,11 @@
  */
 int uhso_debug = 0;
 
-#define DPRINTF(n, fmt, args...)	do {		\
-	if (uhso_debug >= (n))				\
-		printf("%s: "fmt, __func__ , ##args);	\
+#define DPRINTF(n, ...)	do {			\
+	if (uhso_debug >= (n)) {		\
+		printf("%s: ", __func__);	\
+		printf(__VA_ARGS__);		\
+	}					\
 } while (/* CONSTCOND */0)
 #else
 #define DPRINTF(...)	((void)0)