From a83f488ba4eb1ce8fd072bf087e87aca6ab1ee79 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Sep 2020 16:58:11 +0200 Subject: [PATCH] Fix "warning: array initialized from parenthesized string constant". * tests/test-memmem.c (main): Remove parentheses around string constant. * tests/test-c-strcasestr.c (main): Likewise. * tests/test-strcasestr.c (main): Likewise. --- ChangeLog | 7 +++++++ tests/test-c-strcasestr.c | 14 +++++++------- tests/test-memmem.c | 14 +++++++------- tests/test-strcasestr.c | 14 +++++++------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10ff53a20d..67ab9dd473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-09-05 Bruno Haible + + Fix "warning: array initialized from parenthesized string constant". + * tests/test-memmem.c (main): Remove parentheses around string constant. + * tests/test-c-strcasestr.c (main): Likewise. + * tests/test-strcasestr.c (main): Likewise. + 2020-09-05 Bruno Haible argmatch tests: Fix ISO C compliance warning. diff --git a/tests/test-c-strcasestr.c b/tests/test-c-strcasestr.c index 6ccdd6b6cb..ea8641cfa2 100644 --- a/tests/test-c-strcasestr.c +++ b/tests/test-c-strcasestr.c @@ -60,18 +60,18 @@ main () /* Check that a long periodic needle does not cause false positives. */ { - const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_A7_20_EF_BF_BD"); + const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD"; const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char *result = c_strcasestr (input, need); ASSERT (result == NULL); } { - const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" - "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" + "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char *result = c_strcasestr (input, need); ASSERT (result == input + 115); diff --git a/tests/test-memmem.c b/tests/test-memmem.c index 132265f12c..0368dfdd0c 100644 --- a/tests/test-memmem.c +++ b/tests/test-memmem.c @@ -90,18 +90,18 @@ main (int argc, char *argv[]) /* Check that a long periodic needle does not cause false positives. */ { - const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_A7_20_EF_BF_BD"); + const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD"; const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char *result = memmem (input, strlen (input), need, strlen (need)); ASSERT (result == NULL); } { - const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" - "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" + "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char *result = memmem (input, strlen (input), need, strlen (need)); ASSERT (result == input + 115); diff --git a/tests/test-strcasestr.c b/tests/test-strcasestr.c index 6100fe3afe..3a267c68f2 100644 --- a/tests/test-strcasestr.c +++ b/tests/test-strcasestr.c @@ -74,18 +74,18 @@ main () /* Check that a long periodic needle does not cause false positives. */ { - const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_A7_20_EF_BF_BD"); + const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD"; const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char *result = strcasestr (input, need); ASSERT (result == NULL); } { - const char input[] = ("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" - "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" - "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + const char input[] = "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD" + "_C3_A7_20_EF_BF_BD_DA_B5_C2_A6_20" + "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char need[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; const char *result = strcasestr (input, need); ASSERT (result == input + 115); -- 2.39.5