app: use portable variadic macros

Many places are using a GCC extension related to variadic macros, where a name prepends the ellipsis. This results in a warning like the one below when compiling the code with MSVC: app\test-pmd\testpmd.h(1314): error C2608: invalid token '...' in macro parameter list Variadic macros became a standard part of the C language with C99. GCC, Clang and MSVC handle them properly. The fix is to remove the prefix name (args... becomes ...) and use __VA_ARGS__. Signed-off-by: Andre Muezerie <[email protected]>
DPDK · Dec 23, 2024 · f7c9651 · f7c9651
1 parent ba9fb27
commit f7c9651
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/app/test-acl/main.c b/app/test-acl/main.c
@@ -423,9 +423,9 @@ static const char cb_port_delim[] = ":";
 
 static char line[LINE_MAX];
 
-#define	dump_verbose(lvl, fh, fmt, args...)	do { \
+#define	dump_verbose(lvl, fh, fmt, ...)	do { \
 	if ((lvl) <= (int32_t)config.verbose)        \
-		fprintf(fh, fmt, ##args);            \
+		fprintf(fh, fmt, ##__VA_ARGS__);         \
 } while (0)
 
 

diff --git a/app/test-eventdev/evt_common.h b/app/test-eventdev/evt_common.h
@@ -18,16 +18,16 @@
 #define CLGRN  "\x1b[32m"
 #define CLYEL  "\x1b[33m"
 
-#define evt_err(fmt, args...) \
-	fprintf(stderr, CLRED"error: %s() "fmt CLNRM "\n", __func__, ## args)
+#define evt_err(fmt, ...) \
+	fprintf(stderr, CLRED"error: %s() "fmt CLNRM "\n", __func__, ## __VA_ARGS__)
 
-#define evt_info(fmt, args...) \
-	fprintf(stdout, CLYEL""fmt CLNRM "\n", ## args)
+#define evt_info(fmt, ...) \
+	fprintf(stdout, CLYEL""fmt CLNRM "\n", ## __VA_ARGS__)
 
 #define EVT_STR_FMT 20
 
-#define evt_dump(str, fmt, val...) \
-	printf("\t%-*s : "fmt"\n", EVT_STR_FMT, str, ## val)
+#define evt_dump(str, fmt, ...) \
+	printf("\t%-*s : "fmt"\n", EVT_STR_FMT, str, ## __VA_ARGS__)
 
 #define evt_dump_begin(str) printf("\t%-*s : {", EVT_STR_FMT, str)
 

diff --git a/app/test-mldev/ml_common.h b/app/test-mldev/ml_common.h
@@ -14,11 +14,12 @@
 
 #define ML_STR_FMT 20
 
-#define ml_err(fmt, args...) fprintf(stderr, CLRED "error: %s() " fmt CLNRM "\n", __func__, ##args)
+#define ml_err(fmt, ...) \
+	fprintf(stderr, CLRED "error: %s() " fmt CLNRM "\n", __func__, ##__VA_ARGS__)
 
-#define ml_info(fmt, args...) fprintf(stdout, CLYEL "" fmt CLNRM "\n", ##args)
+#define ml_info(fmt, ...) fprintf(stdout, CLYEL "" fmt CLNRM "\n", ##__VA_ARGS__)
 
-#define ml_dump(str, fmt, val...) printf("\t%-*s : " fmt "\n", ML_STR_FMT, str, ##val)
+#define ml_dump(str, fmt, ...) printf("\t%-*s : " fmt "\n", ML_STR_FMT, str, ##__VA_ARGS__)
 
 #define ml_dump_begin(str) printf("\t%-*s :\n\t{\n", ML_STR_FMT, str)
 

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
@@ -1311,7 +1311,7 @@ RTE_INIT(__##c) \
 #endif
 #endif /* __GCC__ */
 
-#define TESTPMD_LOG(level, fmt, args...) \
-	rte_log(RTE_LOG_ ## level, testpmd_logtype, "testpmd: " fmt, ## args)
+#define TESTPMD_LOG(level, fmt, ...) \
+	rte_log(RTE_LOG_ ## level, testpmd_logtype, "testpmd: " fmt, ## __VA_ARGS__)
 
 #endif /* _TESTPMD_H_ */