Port fe7b3ba63 "linux-gen: fix print formats"

Port original commit from linux-generic.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

5 files changed, 8 insertions, 7 deletions

diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h
index fd9a7951b..0d2782101 100644
--- a/platform/linux-dpdk/include/odp_packet_io_internal.h
+++ b/platform/linux-dpdk/include/odp_packet_io_internal.h
@@ -32,6 +32,7 @@ extern "C" {
 
 #include <linux/if_ether.h>
 #include <sys/select.h>
+#include <inttypes.h>
 
 #define PKTIO_MAX_QUEUES 64
 #define PKTIO_LSO_PROFILES 16
@@ -218,7 +219,7 @@ static inline pktio_entry_t *get_pktio_entry(odp_pktio_t pktio)
 		return NULL;
 
 	if (odp_unlikely(_odp_typeval(pktio) > ODP_CONFIG_PKTIO_ENTRIES)) {
-		ODP_DBG("pktio limit %d/%d exceed\n",
+		ODP_DBG("pktio limit %" PRIuPTR "/%d exceed\n",
 			_odp_typeval(pktio), ODP_CONFIG_PKTIO_ENTRIES);
 		return NULL;
 	}
diff --git a/platform/linux-dpdk/odp_pool.c b/platform/linux-dpdk/odp_pool.c
index 24c9c2aec..3ac6abd03 100644
--- a/platform/linux-dpdk/odp_pool.c
+++ b/platform/linux-dpdk/odp_pool.c
@@ -679,7 +679,7 @@ odp_pool_t odp_pool_create(const char *name, const odp_pool_param_t *params)
 			event_type = ODP_EVENT_PACKET;
 
 			ODP_DBG("type: packet, name: %s, num: %u, len: %u, blk_size: %u, "
-				"uarea_size: %d, hdr_size: %d\n", pool_name, num, params->pkt.len,
+				"uarea_size: %d, hdr_size: %zu\n", pool_name, num, params->pkt.len,
 				blk_size, params->pkt.uarea_size, hdr_size);
 			break;
 		case ODP_POOL_TIMEOUT:
diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c
index 4a4388b2b..7145fb2ce 100644
--- a/platform/linux-dpdk/odp_queue_basic.c
+++ b/platform/linux-dpdk/odp_queue_basic.c
@@ -166,7 +166,7 @@ static int queue_init_global(void)
 	queue_capa(&capa, 0);
 
 	ODP_DBG("... done.\n");
-	ODP_DBG("  queue_entry_t size %u\n", sizeof(queue_entry_t));
+	ODP_DBG("  queue_entry_t size %zu\n", sizeof(queue_entry_t));
 	ODP_DBG("  max num queues     %u\n", capa.max_queues);
 	ODP_DBG("  max queue size     %u\n", capa.plain.max_size);
 	ODP_DBG("  max num lockfree   %u\n", capa.plain.lockfree.max_num);
@@ -697,7 +697,7 @@ static void queue_print(odp_queue_t handle)
 		if (!odp_pktio_info(queue->s.pktout.pktio, &pktio_info))
 			ODP_PRINT("  pktout          %s\n", pktio_info.name);
 	}
-	ODP_PRINT("  timers          %" PRIu32 "\n",
+	ODP_PRINT("  timers          %" PRIu64 "\n",
 		  odp_atomic_load_u64(&queue->s.num_timers));
 	ODP_PRINT("  status          %s\n",
 		  queue->s.status == QUEUE_STATUS_READY ? "ready" :
diff --git a/platform/linux-dpdk/odp_queue_eventdev.c b/platform/linux-dpdk/odp_queue_eventdev.c
index 5233031f6..96baffa6f 100644
--- a/platform/linux-dpdk/odp_queue_eventdev.c
+++ b/platform/linux-dpdk/odp_queue_eventdev.c
@@ -558,7 +558,7 @@ static int queue_init_global(void)
 
 	queue_capa(&capa, 0);
 
-	ODP_DBG("  queue_entry_t size %u\n", sizeof(queue_entry_t));
+	ODP_DBG("  queue_entry_t size %zu\n", sizeof(queue_entry_t));
 	ODP_DBG("  max num queues     %u\n", capa.max_queues);
 	ODP_DBG("  max plain queue size     %u\n", capa.plain.max_size);
 	ODP_DBG("  max num lockfree   %u\n", capa.plain.lockfree.max_num);
@@ -1048,7 +1048,7 @@ static void queue_print(odp_queue_t handle)
 		if (!odp_pktio_info(queue->s.pktout.pktio, &pktio_info))
 			ODP_PRINT("  pktout          %s\n", pktio_info.name);
 	}
-	ODP_PRINT("  timers          %" PRIu32 "\n",
+	ODP_PRINT("  timers          %" PRIu64 "\n",
 		  odp_atomic_load_u64(&queue->s.num_timers));
 	ODP_PRINT("  status          %s\n",
 		  queue->s.status == QUEUE_STATUS_READY ? "ready" :
diff --git a/platform/linux-dpdk/odp_system_info.c b/platform/linux-dpdk/odp_system_info.c
index b48275233..af07f387a 100644
--- a/platform/linux-dpdk/odp_system_info.c
+++ b/platform/linux-dpdk/odp_system_info.c
@@ -95,7 +95,7 @@ static uint64_t default_huge_page_size(void)
 
 	while (fgets(str, sizeof(str), file) != NULL) {
 		if (sscanf(str, "Hugepagesize:   %8lu kB", &sz) == 1) {
-			ODP_DBG("defaut hp size is %" PRIu64 " kB\n", sz);
+			ODP_DBG("default hp size is %lu kB\n", sz);
 			fclose(file);
 			return (uint64_t)sz * 1024;
 		}