From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 1D0CC5927 for ; Thu, 8 Sep 2016 14:25:35 +0200 (CEST) Received: by mail-wm0-f53.google.com with SMTP id b187so165757233wme.1 for ; Thu, 08 Sep 2016 05:25:35 -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=pcWTMPX5VKkbfQZlfaUL2+JzSoefIGFu6F5bDN+Egeo=; b=Zc5E1dfgtwlJcuc3Kb2qX+NxEy2elb/kfg/p4797VbKWcK+yg1YLLJ4o879RWGLdbf V2eqa1+mc4waHPIv1ooVhsW8Hbbeu+7Gqbgp93BdIN0PcDbNL2vmb1Qq5SUsw5/4k/Xz Bo1f7k/qq7HhubkPr2ToaTE1w9CatlHXWmA7R4poU+dKxAH1eNb3d43m9SLcJFAHcuk6 RwmNA6tff9rihbrX+b6jcGLGb1ZIU0CZqtovhtW7z6HgWixyRVoNOJvNZfqHom9yOYF6 MwvvkUhFVuVsEP3+CrxH+t1ckK7Yfqi+eipYXo9ppJiZvK85GTQlIPh9uqT8YK486fxx ZGFQ== 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=pcWTMPX5VKkbfQZlfaUL2+JzSoefIGFu6F5bDN+Egeo=; b=Ss/yxJpBwSE+aGXoB4eUz/o57GJlmYsVZh32vcnjSeWHs4bmXRWqVawaC0ohVYIBKo MJwe2UixnfsgKsir5I22ydGvsB8Y5StBnmEtDvnivH3qnKWp9kVgoXbNfijoQWhMwzTX qdV3K0M3KmCOv4oWPDDASlupyU0RoUtF0nUh6kpBEnIpofEs7tLQpTnjyMNn6mF0eCdh 7SyM3nmp2tjhHkkM4k8IIR68w2pVaQD4iRlv0nz9tIahuwR4wPw5bAQkvHsKpVXoZA+Y cduuaXp4/KLqO9qJdWV7H+b7bh3N/tGoRmxFsGHDQcJe8NnzK9sArzwfjCnBaYnmQaxH Y8SQ== X-Gm-Message-State: AE9vXwOeq6CcCnuf6qgiPD2nos93Gku2mNhPJNctkZCKLBBx8OFKUEBnjOL+ukR4CcgpM6l8 X-Received: by 10.194.206.68 with SMTP id lm4mr4027291wjc.106.1473337534656; Thu, 08 Sep 2016 05:25:34 -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 ub8sm44138552wjc.39.2016.09.08.05.25.33 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 08 Sep 2016 05:25:34 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Thu, 8 Sep 2016 14:25:09 +0200 Message-Id: <328ef81832a6599f7bdfdeb9433a7c78abf56ae9.1473331587.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v5 08/10] 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: Thu, 08 Sep 2016 12:25:35 -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 cf28541..d047ba8 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 a929ef1..cd46674 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