From patchwork Thu Jul 7 15:49:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 14652 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E43F9568F; Thu, 7 Jul 2016 17:50:16 +0200 (CEST) Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by dpdk.org (Postfix) with ESMTP id 3C8CA568E for ; Thu, 7 Jul 2016 17:50:16 +0200 (CEST) Received: by mail-wm0-f46.google.com with SMTP id a66so37295986wme.0 for ; Thu, 07 Jul 2016 08:50:16 -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=aE8FbUTibG+wMYEf7oSTqrWRXFWXBZ31Ak5p1lupI2x9wcPoGeegABA4Ub8f0U+OCN KXIowpmRASeRA6r+4HAx4aJXPy3Z7LQV13eV761h8k8hs2BjTTK5pVwh1zW0sNhmhd+I v7X4HD6JwiwsAcNTKUZNqBwVmljKYFsBtT+PEsBeDfVu3nai+XDzWkY1USUVj3dCMi7f +YRuVMeaXlwL2ULq4kQ1fW9ELhg8Tp00WJ4M1oZ+ovoGvSRLgZGaVNtmoMIh6DXrWoEZ vYpwWQtOVQlqpiJUB3Zwss0wsLDG4H7O+PauCB1KxVMMUa4TNobvKuWxhL+ohWROuCVj QIng== 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=FeRfFxF8t+DcufsBRohl0EjDH+uue26RMxgrp/Net3QKJKN5Fw9275tXeV7D9290eQ 4/6rbb9m/BJpL2jjCHYlnNxW8k4Sj5OmLzUYnGkcnWfJT8n1qOa4ZLT6PiMNy2s/dcYu ereeAd5CKnpzWq06x5M9l9c2hTkAM5FijhlEumD8CdetEpTS1PRr82NCLlJTAWoY8VI+ CWMhRxyxRpiSj4r8IB1q1tliOwBxIDtPI5wmfTY3+lr5g5X6FiXp1TDeuHl80uBDgONU e8uKZC9FG54R7tACKDTAokvrOT4yraISyHg1JStIhXkhy9ZdFoHa8Hap3Nx61bTsd3qr JOvg== X-Gm-Message-State: ALyK8tICU+4QTDj/q9PQ7e5BDgbEBuvP69kritKVuOq67YBhF9arrXI8T2y1ruT/rE+6hPEZ X-Received: by 10.194.220.234 with SMTP id pz10mr848206wjc.142.1467906615813; Thu, 07 Jul 2016 08:50:15 -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 ze10sm3302905wjb.2.2016.07.07.08.50.13 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 07 Jul 2016 08:50:15 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Thu, 7 Jul 2016 17:49:31 +0200 Message-Id: <879bf84eaafff83bd2eee1dfa58b0d8f52c98de3.1467905467.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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))))