[PATCH] hexdump: Make test data really const

[PATCH] hexdump: Make test data really const

[Geert Uytterhoeven]

lib/test-hexdump.c: In function ‘test_hexdump’:
lib/test-hexdump.c:74: warning: assignment discards qualifiers from pointer target type

Make all test data "const char * const" and "__initconst", and the
"result" variable "const char * const" to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 lib/test-hexdump.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
index 9846ff7428b3120f..5241df36eedf922b 100644
--- a/lib/test-hexdump.c
+++ b/lib/test-hexdump.c
@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
 	"4c", "d1", "19", "99", "43", "b1", "af", "0c",
 };
 
-static const char *test_data_2_le[] __initdata = {
+static const char * const test_data_2_le[] __initconst = {
 	"32be", "7bdb", "180a", "b293",
 	"ba70", "24c4", "837d", "9b34",
 	"9ca6", "ad31", "0f9c", "e9ac",
 	"d14c", "9919", "b143", "0caf",
 };
 
-static const char *test_data_4_le[] __initdata = {
+static const char * const test_data_4_le[] __initconst = {
 	"7bdb32be", "b293180a", "24c4ba70", "9b34837d",
 	"ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
 };
 
-static const char *test_data_8_le[] __initdata = {
+static const char * const test_data_8_le[] __initconst = {
 	"b293180a7bdb32be", "9b34837d24c4ba70",
 	"e9ac0f9cad319ca6", "0cafb1439919d14c",
 };
@@ -48,7 +48,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
 	char test[32 * 3 + 2 + 32 + 1];
 	char real[32 * 3 + 2 + 32 + 1];
 	char *p;
-	const char **result;
+	const char * const *result;
 	size_t l = len;
 	int gs = groupsize, rs = rowsize;
 	unsigned int i;
-- 
1.9.1

Re: [PATCH] hexdump: Make test data really const

[Andrew Morton]

On Thu, 16 Apr 2015 21:32:09 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> lib/test-hexdump.c: In function ___test_hexdump___:
> lib/test-hexdump.c:74: warning: assignment discards qualifiers from pointer target type
> 
> Make all test data "const char * const" and "__initconst", and the
> "result" variable "const char * const" to fix this.

Linus has already fixed the warning with 17974c054db303.

I think what remains of your patch makes sense, but we don't actually
have a changelog which explains why we're doing it.

Please cook up a fresh patch when convenient?