From: Volker Lendecke Date: Fri, 22 Nov 2024 09:22:11 +0000 (+0100) Subject: lib: Move some R/W "data" segment to R/O "text" X-Git-Tag: tdb-1.4.13~445 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edc1f99ffa2942a55c1801d0b882a70962dcfb89;p=thirdparty%2Fsamba.git lib: Move some R/W "data" segment to R/O "text" Doesn't really matter for tests, but I just came across it. Signed-off-by: Volker Lendecke Reviewed-by: Martin Schwenke --- diff --git a/lib/util/charset/tests/convert_string.c b/lib/util/charset/tests/convert_string.c index 6400ce15625..de38d81521c 100644 --- a/lib/util/charset/tests/convert_string.c +++ b/lib/util/charset/tests/convert_string.c @@ -34,13 +34,13 @@ struct torture_suite *torture_local_string_case(TALLOC_CTX *mem_ctx); * http://en.wikipedia.org/w/index.php?title=Ancient_Greek&oldid=421361065#Example_text */ -const char *plato_english_ascii = +static const char plato_english_ascii[] = "What you, men of Athens, have learned from my accusers, I do not" " know: but I, for my part, nearly forgot who I was thanks to them since" " they spoke so persuasively. And yet, of the truth, they have spoken," " one might say, nothing at all."; -const char *plato_english_utf16le_base64 = +static const char plato_english_utf16le_base64[] = "VwBoAGEAdAAgAHkAbwB1ACwAIABtAGUAbgAgAG8AZgAgAEEAdABoAGUAbgBzACwAIABoAGEAdgBl" "ACAAbABlAGEAcgBuAGUAZAAgAGYAcgBvAG0AIABtAHkAIABhAGMAYwB1AHMAZQByAHMALAAgAEkA" "IABkAG8AIABuAG8AdAAgAGsAbgBvAHcAOgAgAGIAdQB0ACAASQAsACAAZgBvAHIAIABtAHkAIABw" @@ -51,7 +51,7 @@ const char *plato_english_utf16le_base64 = "AGsAZQBuACwAIABvAG4AZQAgAG0AaQBnAGgAdAAgAHMAYQB5ACwAIABuAG8AdABoAGkAbgBnACAA" "YQB0ACAAYQBsAGwALgA="; -static const char *plato_utf8_base64 = +static const char plato_utf8_base64[] = "4b2Nz4TOuSDOvOG9ss69IOG9kc68zrXhv5bPgiwg4b2mIOG8hM69zrTPgc61z4IgzobOuM63zr3O" "seG/ls6/zrksIM+AzrXPgM+Mzr3OuM6xz4TOtSDhvZHPgOG9uCDPhOG/ts69IOG8kM684b+2zr0g" "zrrOsc+EzrfOs8+Mz4HPic69LCDOv+G9kM66IM6/4by2zrTOsTog4byQzrPhvbwgzrQnIM6/4b2W" @@ -61,7 +61,7 @@ static const char *plato_utf8_base64 = "4b2hz4Ig4byUz4DOv8+CIM614bywz4DOteG/ls69IM6/4b2QzrThvbLOvSDOteG8sM+Bzq7Ous6x" "z4POuc69Lg=="; -static const char *plato_utf16le_base64 = +static const char plato_utf16le_base64[] = "TR/EA7kDIAC8A3IfvQMgAFEfvAO1A9YfwgMsACAAZh8gAAQfvQO0A8EDtQPCAyAAhgO4A7cDvQOx" "A9YfvwO5AywAIADAA7UDwAPMA70DuAOxA8QDtQMgAFEfwAN4HyAAxAP2H70DIAAQH7wD9h+9AyAA" "ugOxA8QDtwOzA8wDwQPJA70DLAAgAL8DUB+6AyAAvwM2H7QDsQM6ACAAEB+zA3wfIAC0AycAIAC/" @@ -71,14 +71,14 @@ static const char *plato_utf16le_base64 = "swO1AyAAYR/CAyAAFB/AA78DwgMgALUDMB/AA7UD1h+9AyAAvwNQH7QDch+9AyAAtQMwH8EDrgO6" "A7EDwwO5A70DLgA="; -static const char *plato_latin_utf8_base64 = +static const char plato_latin_utf8_base64[] = "SMOzdGkgbcOobiBodW1lw65zLCDDtCDDoW5kcmVzIEF0aMSTbmHDrm9pLCBwZXDDs250aGF0ZSBo" "dXDDsiB0w7RuIGVtw7RuIGthdMSTZ8OzcsWNbiwgb3VrIG/DrmRhOiBlZ+G5kSBkJyBvw7tuIGth" "w6wgYXV0w7JzIGh1cCcgYXV0xY1uIG9sw61nb3UgZW1hdXRvw7sgZXBlbGF0aMOzbcSTbiwgaG/D" "unTFjSBwaXRoYW7DtHMgw6lsZWdvbi4gS2HDrXRvaSBhbMSTdGjDqXMgZ2UgaMWNcyDDqXBvcyBl" "aXBlw65uIG91ZMOobiBlaXLhuJdrYXNpbi4="; -static const char *plato_latin_utf16le_base64 = +static const char plato_latin_utf16le_base64[] = "SADzAHQAaQAgAG0A6ABuACAAaAB1AG0AZQDuAHMALAAgAPQAIADhAG4AZAByAGUAcwAgAEEAdABo" "ABMBbgBhAO4AbwBpACwAIABwAGUAcADzAG4AdABoAGEAdABlACAAaAB1AHAA8gAgAHQA9ABuACAA" "ZQBtAPQAbgAgAGsAYQB0ABMBZwDzAHIATQFuACwAIABvAHUAawAgAG8A7gBkAGEAOgAgAGUAZwBR" @@ -88,25 +88,25 @@ static const char *plato_latin_utf16le_base64 = "aQAgAGEAbAATAXQAaADpAHMAIABnAGUAIABoAE0BcwAgAOkAcABvAHMAIABlAGkAcABlAO4AbgAg" "AG8AdQBkAOgAbgAgAGUAaQByABceawBhAHMAaQBuAC4A"; -static const char *gd_utf8_base64 = "R8O8bnRoZXIgRGVzY2huZXI="; -static const char *gd_utf8_upper_base64 = "R8OcTlRIRVIgREVTQ0hORVI="; -static const char *gd_utf8_lower_base64 = "Z8O8bnRoZXIgZGVzY2huZXI="; -static const char *gd_cp850_base64 = "R4FudGhlciBEZXNjaG5lcg=="; -static const char *gd_cp850_upper_base64 = "R5pOVEhFUiBERVNDSE5FUg=="; -static const char *gd_cp850_lower_base64 = "Z4FudGhlciBkZXNjaG5lcg=="; -static const char *gd_iso8859_1_base64 = "R/xudGhlciBEZXNjaG5lcg=="; -static const char *gd_utf16le_base64 = "RwD8AG4AdABoAGUAcgAgAEQAZQBzAGMAaABuAGUAcgA="; +static const char gd_utf8_base64[] = "R8O8bnRoZXIgRGVzY2huZXI="; +static const char gd_utf8_upper_base64[] = "R8OcTlRIRVIgREVTQ0hORVI="; +static const char gd_utf8_lower_base64[] = "Z8O8bnRoZXIgZGVzY2huZXI="; +static const char gd_cp850_base64[] = "R4FudGhlciBEZXNjaG5lcg=="; +static const char gd_cp850_upper_base64[] = "R5pOVEhFUiBERVNDSE5FUg=="; +static const char gd_cp850_lower_base64[] = "Z4FudGhlciBkZXNjaG5lcg=="; +static const char gd_iso8859_1_base64[] = "R/xudGhlciBEZXNjaG5lcg=="; +static const char gd_utf16le_base64[] = "RwD8AG4AdABoAGUAcgAgAEQAZQBzAGMAaABuAGUAcgA="; /* täst */ -static const char *utf8_nfc_base64 = "dMOkc3QA"; +static const char utf8_nfc_base64[] = "dMOkc3QA"; /* täst, where ä = a + combining diaeresis */ -static const char *utf8_nfd_base64 = "dGHMiHN0AA=="; +static const char utf8_nfd_base64[] = "dGHMiHN0AA=="; /* * These cp850 bytes correspond to high Unicode codes, stretching out to * 3-byte sequences in utf-8. */ -static const char *cp850_high_points = "\xb9\xba\xbb\xbc\xcd\xce"; -static const char *utf8_high_points = "╣║╗╝═╬"; +static const char cp850_high_points[] = "\xb9\xba\xbb\xbc\xcd\xce"; +static const char utf8_high_points[] = "╣║╗╝═╬"; static bool test_cp850_high_points(struct torture_context *tctx) {