summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-09-26 11:26:50 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-26 11:28:16 +0200
commitf3e69079eefa18407b110ff23df26f7711ebf7e5 (patch)
tree4337766e47fc481b0f63ba1eeb481c8e1a3d9983
parent41d9b6acca8775b5c04c0d415a3e4cd8af09cfe6 (diff)
Declare language tag lists as const.
-rwxr-xr-xscripts/update-language-subtags2
-rw-r--r--src/language_tag.cc2
-rw-r--r--src/language_tag_lists.cc10
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/update-language-subtags b/scripts/update-language-subtags
index e533466d..5990085e 100755
--- a/scripts/update-language-subtags
+++ b/scripts/update-language-subtags
@@ -30,7 +30,7 @@ def escape(s):
with open('src/language_tag_lists.cc', 'w') as f:
for k, v in lists.items():
- print("static LanguageTag::SubtagData %s_list[] = {" % k, file=f)
+ print("static LanguageTag::SubtagData const %s_list[] = {" % k, file=f)
for e in v:
print('\t{ "%s", "%s" },' % (escape(e[0]), escape(e[1])), file=f)
print("};", file=f)
diff --git a/src/language_tag.cc b/src/language_tag.cc
index 4ac90507..cb5f84c9 100644
--- a/src/language_tag.cc
+++ b/src/language_tag.cc
@@ -55,7 +55,7 @@ using namespace dcp;
static
optional<LanguageTag::SubtagData>
-find_in_list (LanguageTag::SubtagData* list, int length, string subtag)
+find_in_list (LanguageTag::SubtagData const * list, int length, string subtag)
{
for (int i = 0; i < length; ++i) {
if (list[i].subtag == subtag) {
diff --git a/src/language_tag_lists.cc b/src/language_tag_lists.cc
index 81211828..a85fb0c7 100644
--- a/src/language_tag_lists.cc
+++ b/src/language_tag_lists.cc
@@ -1,4 +1,4 @@
-static LanguageTag::SubtagData language_list[] = {
+static LanguageTag::SubtagData const language_list[] = {
{ "aa", "Afar" },
{ "ab", "Abkhazian" },
{ "ae", "Avestan" },
@@ -8179,7 +8179,7 @@ static LanguageTag::SubtagData language_list[] = {
{ "zzj", "Zuojiang Zhuang" },
};
-static LanguageTag::SubtagData extlang_list[] = {
+static LanguageTag::SubtagData const extlang_list[] = {
{ "aao", "Algerian Saharan Arabic" },
{ "abh", "Tajiki Arabic" },
{ "abv", "Baharna Arabic" },
@@ -8421,7 +8421,7 @@ static LanguageTag::SubtagData extlang_list[] = {
{ "zsm", "Standard Malay" },
};
-static LanguageTag::SubtagData script_list[] = {
+static LanguageTag::SubtagData const script_list[] = {
{ "Adlm", "Adlam" },
{ "Afak", "Afaka" },
{ "Aghb", "Caucasian Albanian" },
@@ -8626,7 +8626,7 @@ static LanguageTag::SubtagData script_list[] = {
{ "Zzzz", "Code for uncoded script" },
};
-static LanguageTag::SubtagData region_list[] = {
+static LanguageTag::SubtagData const region_list[] = {
{ "AA", "Private use" },
{ "AC", "Ascension Island" },
{ "AD", "Andorra" },
@@ -8933,7 +8933,7 @@ static LanguageTag::SubtagData region_list[] = {
{ "419", "Latin America and the Caribbean" },
};
-static LanguageTag::SubtagData variant_list[] = {
+static LanguageTag::SubtagData const variant_list[] = {
{ "1606nict", "Late Middle French (to 1606)" },
{ "1694acad", "Early Modern French" },
{ "1901", "Traditional German orthography" },