ndr tests: silence a harmless warning
authorDouglas Bagnall <douglas@halo.gen.nz>
Sat, 25 Feb 2017 00:38:17 +0000 (13:38 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 2 Mar 2017 03:35:14 +0000 (04:35 +0100)
gcc 7.

"duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier]"

Signed-off-by: Douglas Bagnall <douglas@halo.gen.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/torture/ndr/string.c

index b682555dc423781849eaac4b541b4ce8211a035d..a53acaa5b911451b684b5d59d5d11e1cac0e5c34 100644 (file)
@@ -4,18 +4,18 @@
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 
-static const char const *ascii = "ascii";
+static const char *ascii = "ascii";
 /* the following is equivalent to "kamelåså öäüÿéèóò" in latin1 */
-static const char const latin1[] = { 0x6b, 0x61, 0x6d, 0x65, 0x6c, 0xe5, 0x73,
-                                     0xe5, 0x20, 0xF6, 0xE4, 0xFC, 0xFF, 0xE9,
-                                     0xE8, 0xF3, 0xF2, 0x00 };
+static const char latin1[] = { 0x6b, 0x61, 0x6d, 0x65, 0x6c, 0xe5, 0x73,
+                              0xe5, 0x20, 0xF6, 0xE4, 0xFC, 0xFF, 0xE9,
+                              0xE8, 0xF3, 0xF2, 0x00 };
 /* the following is equivalent to "kamelåså ☺☺☺ öäüÿéèóò" in utf8 */
-static const char const utf8[] = { 0x6b, 0x61, 0x6d, 0x65, 0x6c, 0xc3, 0xa5,
-                                   0x73, 0xc3, 0xa5, 0x20, 0xE2, 0x98, 0xBA,
-                                   0xE2, 0x98, 0xBA, 0xE2, 0x98, 0xBA, 0x20,
-                                   0xc3, 0xb6, 0xc3, 0xa4, 0xc3, 0xbc, 0xc3,
-                                   0xbf, 0xc3, 0xa9, 0xc3, 0xa8, 0xc3, 0xb3,
-                                   0xc3, 0xb2, 0x00 };
+static const char utf8[] = { 0x6b, 0x61, 0x6d, 0x65, 0x6c, 0xc3, 0xa5,
+                            0x73, 0xc3, 0xa5, 0x20, 0xE2, 0x98, 0xBA,
+                            0xE2, 0x98, 0xBA, 0xE2, 0x98, 0xBA, 0x20,
+                            0xc3, 0xb6, 0xc3, 0xa4, 0xc3, 0xbc, 0xc3,
+                            0xbf, 0xc3, 0xa9, 0xc3, 0xa8, 0xc3, 0xb3,
+                            0xc3, 0xb2, 0x00 };
 
 /* purely for convenience */
 static int fl_ascii_null = LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM;