Merge tag 'v1.41.0.0' of https://github.com/OpenDataPlane/odp into odp-dpdk

Signed-off-by: Matias Elo <matias.elo@nokia.com>

2 files changed, 31 insertions, 26 deletions

diff --git a/helper/include/odp/helper/odph_debug.h b/helper/include/odp/helper/odph_debug.h
index bedef2f66..7cb2ee617 100644
--- a/helper/include/odp/helper/odph_debug.h
+++ b/helper/include/odp/helper/odph_debug.h
@@ -24,14 +24,16 @@
 extern "C" {
 #endif
 
+#pragma GCC diagnostic push
+
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
+
 /** @addtogroup odph_debug ODPH DEBUG
  *  @{
  */
 
-/* Avoid "ISO C99 requires at least one argument for the "..."  in a variadic
- * macro" errors when building with 'pedantic' option. */
-#pragma GCC system_header
-
 /**
  * Assert macro for applications and helper code
  *
@@ -61,50 +63,50 @@ typedef enum odph_log_level {
  */
 #define ODPH_LOG(level, fmt, ...) \
 do { \
-	switch (level) { \
-	case ODPH_LOG_ERR: \
-		fprintf(stderr, "%s:%d:%s():" fmt, __FILE__, \
-		__LINE__, __func__, ##__VA_ARGS__); \
-		break; \
-	case ODPH_LOG_DBG: \
-		if (ODPH_DEBUG_PRINT == 1) \
-			fprintf(stderr, "%s:%d:%s():" fmt, __FILE__, \
-			__LINE__, __func__, ##__VA_ARGS__); \
-		break; \
-	case ODPH_LOG_ABORT: \
+	if (level != ODPH_LOG_DBG || ODPH_DEBUG_PRINT == 1) \
 		fprintf(stderr, "%s:%d:%s(): " fmt, __FILE__, \
 		__LINE__, __func__, ##__VA_ARGS__); \
+	if (level == ODPH_LOG_ABORT) \
 		abort(); \
-		break; \
-	default: \
-		fprintf(stderr, "Unknown LOG level"); \
-		break;\
-	} \
 } while (0)
 
 /**
  * Debug printing macro, which prints output when DEBUG flag is set.
  */
-#define ODPH_DBG(fmt, ...) \
-		ODPH_LOG(ODPH_LOG_DBG, fmt, ##__VA_ARGS__)
+#define ODPH_DBG(...) \
+	do { \
+		__extension__ ({ \
+			ODPH_LOG(ODPH_LOG_DBG, ##__VA_ARGS__); \
+		}); \
+	} while (0)
 
 /**
  * Print output to stderr (file, line and function).
  */
-#define ODPH_ERR(fmt, ...) \
-		ODPH_LOG(ODPH_LOG_ERR, fmt, ##__VA_ARGS__)
+#define ODPH_ERR(...) \
+	do { \
+		__extension__ ({ \
+			ODPH_LOG(ODPH_LOG_ERR, ##__VA_ARGS__); \
+		}); \
+	} while (0)
 
 /**
  * Print output to stderr (file, line and function),
  * then abort.
  */
-#define ODPH_ABORT(fmt, ...) \
-		ODPH_LOG(ODPH_LOG_ABORT, fmt, ##__VA_ARGS__)
+#define ODPH_ABORT(...) \
+	do { \
+		__extension__ ({ \
+			ODPH_LOG(ODPH_LOG_ABORT, ##__VA_ARGS__); \
+		}); \
+	} while (0)
 
 /**
  * @}
  */
 
+#pragma GCC diagnostic pop
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/helper/test/chksum.c b/helper/test/chksum.c
index d14ee20d1..3b1f8ed9f 100644
--- a/helper/test/chksum.c
+++ b/helper/test/chksum.c
@@ -107,6 +107,9 @@ int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 				       ODPH_IPV4HDR_LEN);
 	ip->proto = ODPH_IPPROTO_UDP;
 	ip->id = odp_cpu_to_be_16(1);
+	ip->tos = 0;
+	ip->frag_offset = 0;
+	ip->ttl = 0;
 	odp_packet_has_ipv4_set(test_packet, 1);
 	if (odph_ipv4_csum_update(test_packet) < 0)
 		status = -1;