flow_classify: fix ISO C in exported header
authorAdrien Mazarguil <adrien.mazarguil@6wind.com>
Thu, 21 Dec 2017 12:59:59 +0000 (13:59 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 16 Jan 2018 23:27:19 +0000 (00:27 +0100)
Reported by check-includes.sh:

 [...]/rte_flow_classify.h:85:47: error: ISO C does not permit named
     variadic macros [-Werror=variadic-macros]
  #define RTE_FLOW_CLASSIFY_LOG(level, fmt, args...) \
                                                ^

Fixes: be41ac2a330f ("flow_classify: introduce flow classify library")
Cc: stable@dpdk.org
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
lib/librte_flow_classify/rte_flow_classify.h

index b1016d3..d76c235 100644 (file)
@@ -41,6 +41,7 @@
  *    with rte_flow_classifier_free()
  */
 
+#include <rte_common.h>
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 #include <rte_flow.h>
@@ -53,9 +54,12 @@ extern "C" {
 
 extern int librte_flow_classify_logtype;
 
-#define RTE_FLOW_CLASSIFY_LOG(level, fmt, args...) \
-rte_log(RTE_LOG_ ## level, librte_flow_classify_logtype, "%s(): " fmt, \
-       __func__, ## args)
+#define RTE_FLOW_CLASSIFY_LOG(level, ...) \
+       rte_log(RTE_LOG_ ## level, \
+               librte_flow_classify_logtype, \
+               RTE_FMT("%s(): " RTE_FMT_HEAD(__VA_ARGS__,), \
+                       __func__, \
+                       RTE_FMT_TAIL(__VA_ARGS__,)))
 
 #ifndef RTE_FLOW_CLASSIFY_TABLE_MAX
 #define RTE_FLOW_CLASSIFY_TABLE_MAX            32