Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension.
Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com> --- lib/cryptodev/rte_cryptodev.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index f6ab0e5..00ba6a2 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -34,22 +34,19 @@ /* Logging Macros */ #define CDEV_LOG_ERR(...) \ - RTE_LOG_LINE(ERR, CRYPTODEV, \ - RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \ - __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) + RTE_LOG_LINE_PREFIX(ERR, CRYPTODEV, \ + "%s() line %u: ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) #define CDEV_LOG_INFO(...) \ RTE_LOG_LINE(INFO, CRYPTODEV, "" __VA_ARGS__) #define CDEV_LOG_DEBUG(...) \ - RTE_LOG_LINE(DEBUG, CRYPTODEV, \ - RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \ - __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) + RTE_LOG_LINE_PREFIX(DEBUG, CRYPTODEV, \ + "%s() line %u: ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) #define CDEV_PMD_TRACE(...) \ - RTE_LOG_LINE(DEBUG, CRYPTODEV, \ - RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__ ,), \ - dev, __func__, RTE_FMT_TAIL(__VA_ARGS__ ,))) + RTE_LOG_LINE_PREFIX(DEBUG, CRYPTODEV, \ + "[%s] %s: ", dev RTE_LOG_COMMA __func__, __VA_ARGS__) /** * A macro that points to an offset from the start -- 1.8.3.1