From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id CE16D5582 for ; Tue, 5 Jul 2016 12:45:27 +0200 (CEST) Received: by mail-wm0-f46.google.com with SMTP id a66so146919324wme.0 for ; Tue, 05 Jul 2016 03:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=mwhmcGp3jmGxeyBNdMhHQWru18Vo+aQagoh3OFCxk8I=; b=LC8mp0qy+BV/OM7j/99hoG1ELEU9bq8UbVsDlK2cqRJj/+6QpnrUNZFWALdGIzPGvO Let6UN8/Iq3k+2YAWfkIE1upDx2MOM81Msw8qy+3/KRLkzvoRM9jv5orqAcSAHtBPoDa rfyaFhzgdbE2gLLy21OJBmA7i6ILIJKgc8aAksFxSU0bzeOd60pszjPfLZ3P9rcVIEn+ s0RuN8hXMKMvFZZGQ9LujxVcAth7Bqk7hywIWzC1+dguDwGephnhSf+eFnA6vCUkF8Tc 5ig6i7W/S5lWP41Ais5Brma/ObSfRCB/dc3JP2hRv7gq8mmBsFc5ugksA3mZ92E8xsdx /Cvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=mwhmcGp3jmGxeyBNdMhHQWru18Vo+aQagoh3OFCxk8I=; b=LcVD8rOm2dgAbse8HjjPRhxQsOZDiMXy8ngoeYUDz8ux+Ca0ecAVEC8NL+eO2gLlX1 ph/3oP01kLLN43N4RoIm+eh8RKpEsTbcxSrgshKlVm3EtChD6zVO8nto6XcAyiYlBgdt 5lh9c6cCwcr+f1JWikZ7Z/56/++ZUeeJT7Fes8XRgW0fIrqnJ5GhHh5JI9mWgIXVgLaV op6QtDl+gmBG4T0pFdNQ7GbOMsmPEhWLmR59HRRkhoZ0VjqwO106Sa9srV2Ug861YroX 5xQbcFwDquZnOrb1DFLTUBr/htQJWC+a4tiYmev6cQx27HLd3n37lDXy+zZooudZY1U1 zn0w== X-Gm-Message-State: ALyK8tJPX2EaoyFgqwKtf8QzdFjk6OgpzI/dGq9r0GsU04qYB1g5XmBG4Y7eVV84pbmUNB/Q X-Received: by 10.28.74.20 with SMTP id x20mr16031867wma.14.1467715527389; Tue, 05 Jul 2016 03:45:27 -0700 (PDT) Received: from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id ib10sm291292wjb.31.2016.07.05.03.45.26 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 05 Jul 2016 03:45:26 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 5 Jul 2016 12:44:55 +0200 Message-Id: <07ed08f4c78f0f1457a7bb2075330db9e5aa07aa.1467715254.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: <1459865290-10248-1-git-send-email-adrien.mazarguil@6wind.com> Subject: [dpdk-dev] [PATCH v2 09/11] lib: remove named variadic macros in exported headers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2016 10:45:28 -0000 Exported header files used by applications should allow the strictest compiler flags. Language extensions used in many places must be explicitly marked or removed to avoid warnings and compilation failures. Since there is no way to force named variadic macros as extensions, use a a standard __VA_ARGS__ with an extra dummy argument to format strings. This commit prevents the following errors: error: ISO C does not permit named variadic macros Signed-off-by: Adrien Mazarguil --- lib/librte_cryptodev/rte_cryptodev.h | 32 ++++++++++++++----------- lib/librte_cryptodev/rte_cryptodev_pmd.h | 2 +- lib/librte_eal/common/include/rte_common.h | 9 +++++++ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h index be9a544..febea9b 100644 --- a/lib/librte_cryptodev/rte_cryptodev.h +++ b/lib/librte_cryptodev/rte_cryptodev.h @@ -77,26 +77,30 @@ extern const char **rte_cyptodev_names; /* Logging Macros */ -#define CDEV_LOG_ERR(fmt, args...) \ - RTE_LOG(ERR, CRYPTODEV, "%s() line %u: " fmt "\n", \ - __func__, __LINE__, ## args) +#define CDEV_LOG_ERR(...) \ + RTE_LOG(ERR, CRYPTODEV, \ + RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ + __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,))) -#define CDEV_PMD_LOG_ERR(dev, fmt, args...) \ - RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - dev, __func__, __LINE__, ## args) +#define CDEV_PMD_LOG_ERR(dev, ...) \ + RTE_LOG(ERR, CRYPTODEV, \ + RTE_FMT("[%s] %s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ + dev, __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,))) #ifdef RTE_LIBRTE_CRYPTODEV_DEBUG -#define CDEV_LOG_DEBUG(fmt, args...) \ - RTE_LOG(DEBUG, CRYPTODEV, "%s() line %u: " fmt "\n", \ - __func__, __LINE__, ## args) \ +#define CDEV_LOG_DEBUG(...) \ + RTE_LOG(DEBUG, CRYPTODEV, \ + RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ + __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,))) -#define CDEV_PMD_TRACE(fmt, args...) \ - RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s: " fmt "\n", \ - dev, __func__, ## args) +#define CDEV_PMD_TRACE(...) \ + RTE_LOG(DEBUG, CRYPTODEV, \ + RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ + dev, __func__, RTE_FMT_TAIL(__VA_ARGS__,))) #else -#define CDEV_LOG_DEBUG(fmt, args...) -#define CDEV_PMD_TRACE(fmt, args...) +#define CDEV_LOG_DEBUG(...) (void)0 +#define CDEV_PMD_TRACE(...) (void)0 #endif /** diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index cf08a50..4a07362 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -62,7 +62,7 @@ extern "C" { #define RTE_PMD_DEBUG_TRACE(...) \ rte_pmd_debug_trace(__func__, __VA_ARGS__) #else -#define RTE_PMD_DEBUG_TRACE(fmt, args...) +#define RTE_PMD_DEBUG_TRACE(...) #endif struct rte_cryptodev_session { diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index 98ecc1c..db5ac91 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -335,6 +335,15 @@ rte_bsf32(uint32_t v) /** Take a macro value and get a string version of it */ #define RTE_STR(x) _RTE_STR(x) +/** + * ISO C helpers to modify format strings using variadic macros. + * This is a replacement for the ", ## __VA_ARGS__" GNU extension. + * An empty %s argument is appended to avoid a dangling comma. + */ +#define RTE_FMT(fmt, ...) fmt "%.0s", __VA_ARGS__ "" +#define RTE_FMT_HEAD(fmt, ...) fmt +#define RTE_FMT_TAIL(fmt, ...) __VA_ARGS__ + /** Mask value of type "tp" for the first "ln" bit set. */ #define RTE_LEN2MASK(ln, tp) \ ((tp)((uint64_t)-1 >> (sizeof(uint64_t) * CHAR_BIT - (ln)))) -- 2.1.4