[dpdk-stable] patch 'test/cmdline: fix inputs array' has been queued to stable release 19.11.9

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon May 17 18:09:12 CEST 2021


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 <christian.ehrhardt at canonical.com>

---
>From 20d9298ce0316749636b8c16093b376d14b6160d Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
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 <ktraynor at redhat.com>
---
 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


More information about the stable mailing list