Fixed two more places where non-C++11 string concatenation is
used. Spotted by John McNamara.
Signed-off-by: Stefan Puiu <stefan.puiu at gmail.com>
---
lib/librte_mempool/rte_mempool.h | 8 ++++----
lib/librte_vhost/vhost-net-cdev.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 3314651..48e9972 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -342,7 +342,7 @@ static inline void __mempool_check_cookies(const struct
rte_mempool *mp,
if (cookie != RTE_MEMPOOL_HEADER_COOKIE1) {
rte_log_set_history(0);
RTE_LOG(CRIT, MEMPOOL,
- "obj=%p, mempool=%p,
cookie=%"PRIx64"\n",
+ "obj=%p, mempool=%p, cookie=%" PRIx64
"\n",
obj, mp, cookie);
rte_panic("MEMPOOL: bad header cookie (put)\n");
}
@@ -352,7 +352,7 @@ static inline void __mempool_check_cookies(const struct
rte_mempool *mp,
if (cookie != RTE_MEMPOOL_HEADER_COOKIE2) {
rte_log_set_history(0);
RTE_LOG(CRIT, MEMPOOL,
- "obj=%p, mempool=%p,
cookie=%"PRIx64"\n",
+ "obj=%p, mempool=%p, cookie=%" PRIx64
"\n",
obj, mp, cookie);
rte_panic("MEMPOOL: bad header cookie (get)\n");
}
@@ -363,7 +363,7 @@ static inline void __mempool_check_cookies(const struct
rte_mempool *mp,
cookie != RTE_MEMPOOL_HEADER_COOKIE2) {
rte_log_set_history(0);
RTE_LOG(CRIT, MEMPOOL,
- "obj=%p, mempool=%p,
cookie=%"PRIx64"\n",
+ "obj=%p, mempool=%p, cookie=%" PRIx64
"\n",
obj, mp, cookie);
rte_panic("MEMPOOL: bad header cookie
(audit)\n");
}
@@ -372,7 +372,7 @@ static inline void __mempool_check_cookies(const struct
rte_mempool *mp,
if (cookie != RTE_MEMPOOL_TRAILER_COOKIE) {
rte_log_set_history(0);
RTE_LOG(CRIT, MEMPOOL,
- "obj=%p, mempool=%p, cookie=%"PRIx64"\n",
+ "obj=%p, mempool=%p, cookie=%" PRIx64 "\n",
obj, mp, cookie);
rte_panic("MEMPOOL: bad trailer cookie\n");
}
diff --git a/lib/librte_vhost/vhost-net-cdev.h
b/lib/librte_vhost/vhost-net-cdev.h
index 03a5c57..37e4ad2 100644
--- a/lib/librte_vhost/vhost-net-cdev.h
+++ b/lib/librte_vhost/vhost-net-cdev.h
@@ -55,9 +55,9 @@
char packet[VHOST_MAX_PRINT_BUFF]; \
\
if ((header)) \
- snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%"PRIu64") Header size
%d: ", (device->device_fh), (size)); \
+ snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%" PRIu64 ") Header
size %d: ", (device->device_fh), (size)); \
else \
- snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%"PRIu64") Packet size
%d: ", (device->device_fh), (size)); \
+ snprintf(packet, VHOST_MAX_PRINT_BUFF, "(%" PRIu64 ") Packet
size %d: ", (device->device_fh), (size)); \
for (index = 0; index < (size); index++) { \
snprintf(packet + strnlen(packet, VHOST_MAX_PRINT_BUFF),
VHOST_MAX_PRINT_BUFF - strnlen(packet, VHOST_MAX_PRINT_BUFF), \
"%02hhx ", pkt_addr[index]); \
--
1.7.9.5
