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 3C591A0A02 for ; Mon, 17 May 2021 18:15:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 310E3410EA; Mon, 17 May 2021 18:15:26 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 756B840041 for ; Mon, 17 May 2021 18:15:25 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1liftt-0008Ct-9S; Mon, 17 May 2021 16:15:25 +0000 From: Christian Ehrhardt To: Kevin Traynor Cc: dpdk stable Date: Mon, 17 May 2021 18:09:12 +0200 Message-Id: <20210517161039.3132619-123-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/cmdline: fix inputs array' 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 05/19/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/20d9298ce0316749636b8c16093b376d14b6160d Thanks. Christian Ehrhardt --- >From 20d9298ce0316749636b8c16093b376d14b6160d Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Tue, 20 Apr 2021 14:21:49 +0100 Subject: [PATCH] test/cmdline: fix inputs array [ upstream commit 414245bbc527b6ff6da0dc0787c6e5c67556d9ec ] clang 12 gives a warning about string concatenation in arrays. In this case it looks like it was unintentional to concatenate the strings. Separate with a comma. $ clang --version clang version 12.0.0 (Fedora 12.0.0-0.3.rc1.fc34) ../app/test/test_cmdline_ipaddr.c:259:3: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation] "random invalid text", ^ ../app/test/test_cmdline_ipaddr.c:258:3: note: place parentheses around the string literal to silence warning "1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234" ^ Signed-off-by: Kevin Traynor --- app/test/test_cmdline_ipaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c index 088cd5afc3..312ed79c49 100644 --- a/app/test/test_cmdline_ipaddr.c +++ b/app/test/test_cmdline_ipaddr.c @@ -255,7 +255,7 @@ const char * ipaddr_invalid_strs[] = { /** misc **/ /* too long */ - "1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234" + "1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234", "random invalid text", "", "\0", -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.239321543 +0200 +++ 0123-test-cmdline-fix-inputs-array.patch 2021-05-17 17:40:29.351810894 +0200 @@ -1 +1 @@ -From 414245bbc527b6ff6da0dc0787c6e5c67556d9ec Mon Sep 17 00:00:00 2001 +From 20d9298ce0316749636b8c16093b376d14b6160d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 414245bbc527b6ff6da0dc0787c6e5c67556d9ec ] + @@ -30 +32 @@ -index b3f50d80d2..2a1ee120fc 100644 +index 088cd5afc3..312ed79c49 100644