From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 95AC53989 for ; Wed, 13 Jul 2016 15:03:47 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id o80so68150714wme.1 for ; Wed, 13 Jul 2016 06:03:47 -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=o1C6FP2+TffRsSYjxrqYrGTuaJ4x5A4Bb13jmugA//o=; b=03NkMK0jHr/c120MXr/ZkKY4pCC2hTkJ65uo9j/TpBQKqXpxdbwMhz8dHJhCgoFkLf o1XXI15ad4fKEkdiFtK/5mGX47KuB7ob5Ep4U2NfV9BwN/2Qn7+3x6bq51ivCbcUEZPe U0UE+9E5v7FSgdAmd4TLeYt9VV8E9CkxyVImg9ctvzp1gJDecPdH3WlJa+XxGi4UnAZ1 owM6En99nUGH3p7Dz+Z8rjKv2F5A4PuaWYCTPziLHc6tGHfxfusbJF3AIJHPhv3awfFp O9VBxmE20M03cu+FSeoH5t5skoMvF7dr5S6Qwg1JWZ6JfM6RB1AhXCX72acjdVhvsxn3 TWDA== 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=o1C6FP2+TffRsSYjxrqYrGTuaJ4x5A4Bb13jmugA//o=; b=Ag3CBoi+7FDE9l7oQdVJY5BXE6GTMrGomYts2Bz/4aeMVERAVc+dfeUNSGq01cxXUh U1TkEKI8W4Hw41b4hi7Fdfy/pSGhwyM6W+bCd70y+713LOHOJ91u4TQ1x0TK5bsu7S0v 38kqYCZPrQBPCXjKmrm5qF50/S5SDXfFXQ13c/9edEVH4dskdt+QjbCX+4Zb938fyKNh XCP1TL3S2ag4iPO9eCR+8gPX1dJwPl0CW7DWqTxSvLK0wP8NokY2UfLzsohTmoVWI3yE Cxp/fSc9I2TRl7Um0gll2On4LcvUsXmUmedo6OQVLKsHhlbXxxC2Z97vIjSbYhvmj+G0 3rag== X-Gm-Message-State: ALyK8tKuQr78f8WqepV6nTFTzoVnhnqJb334s74iYJsBDTzHmamXNAFPVehHCUoHNIgivZml X-Received: by 10.194.86.131 with SMTP id p3mr803970wjz.91.1468415027122; Wed, 13 Jul 2016 06:03:47 -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 n26sm1783036wmi.3.2016.07.13.06.03.45 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 13 Jul 2016 06:03:46 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Wed, 13 Jul 2016 15:02:45 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 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: Wed, 13 Jul 2016 13:03:47 -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 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