From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67EB4A0C45 for ; Thu, 10 Jun 2021 14:08:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 624764003C; Thu, 10 Jun 2021 14:08:44 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 3124F4003C for ; Thu, 10 Jun 2021 14:08:43 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJUJ-0000EY-1D; Thu, 10 Jun 2021 12:08:43 +0000 From: Christian Ehrhardt To: Kevin Traynor Cc: dpdk stable Date: Thu, 10 Jun 2021 14:06:41 +0200 Message-Id: <20210610120641.885862-53-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/cmdline: silence clang 12 warning' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f6a3c19b14b0cf39bd1231903b8745c3fff4d0fb Thanks. Christian Ehrhardt --- >From f6a3c19b14b0cf39bd1231903b8745c3fff4d0fb Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Tue, 20 Apr 2021 14:21:50 +0100 Subject: [PATCH] test/cmdline: silence clang 12 warning [ upstream commit 5ac070cfed17111ccaf5aee0cc08119ebb1c4e5e ] clang 12 gives a warning about string concatenation in arrays. In this case, as it is a long string test the strings are concatenated. Add parentheses to indicate this. $ clang --version clang version 12.0.0 (Fedora 12.0.0-0.3.rc1.fc34) ../app/test/test_cmdline_num.c:204:5: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation] "1111000011110000111100001111000011110000111100001111000011110000", ^ ../app/test/test_cmdline_num.c:203:3: note: place parentheses around the string literal to silence warning "0b1111000011110000111100001111000011110000111100001111000011110000" ^ Signed-off-by: Kevin Traynor --- app/test/test_cmdline_num.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c index 4c97caf3d0..481fc38295 100644 --- a/app/test/test_cmdline_num.c +++ b/app/test/test_cmdline_num.c @@ -200,8 +200,8 @@ const char * num_invalid_strs[] = { "-0x1234580A", "-0b0111010101", /* too long (128+ chars) */ - "0b1111000011110000111100001111000011110000111100001111000011110000" - "1111000011110000111100001111000011110000111100001111000011110000", + ("0b1111000011110000111100001111000011110000111100001111000011110000" + "1111000011110000111100001111000011110000111100001111000011110000"), "1E3", "0A", "-B", -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:05:00.553624392 +0200 +++ 0053-test-cmdline-silence-clang-12-warning.patch 2021-06-10 14:04:58.114024999 +0200 @@ -1 +1 @@ -From 5ac070cfed17111ccaf5aee0cc08119ebb1c4e5e Mon Sep 17 00:00:00 2001 +From f6a3c19b14b0cf39bd1231903b8745c3fff4d0fb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5ac070cfed17111ccaf5aee0cc08119ebb1c4e5e ] + @@ -30 +32 @@ -index ec479cdb3a..9276de59bd 100644 +index 4c97caf3d0..481fc38295 100644