[dpdk-stable] patch 'test/cmdline: silence clang 12 warning' has been queued to stable release 19.11.9

Christian Ehrhardt christian.ehrhardt at canonical.com
Thu Jun 10 14:06:41 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 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 <christian.ehrhardt at canonical.com>

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


More information about the stable mailing list