From 549ea06e4217aca10d3a73dc09cf5018c51bc23a Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Tue, 18 Mar 2025 08:37:07 -0700 Subject: [PATCH] Fix headerscheck warning. Reported-by: Tom Lane Discussion: https://postgr.es/m/93731.1742310701@sss.pgh.pa.us --- src/common/unicode/generate-unicode_case_table.pl | 14 -------------- src/common/unicode_case.c | 11 +++++++++++ src/include/common/unicode_case_table.h | 11 ----------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/common/unicode/generate-unicode_case_table.pl b/src/common/unicode/generate-unicode_case_table.pl index ddd0980719b..c2adf1662a0 100644 --- a/src/common/unicode/generate-unicode_case_table.pl +++ b/src/common/unicode/generate-unicode_case_table.pl @@ -466,20 +466,6 @@ foreach my $entry (@{ $map{special} }) print $OT "\n};\n"; -print $OT <<"EOS"; - -/* - * Map for each case kind. - */ -static const pg_wchar *casekind_map[NCaseKind] = -{ - [CaseLower] = case_map_lower, - [CaseTitle] = case_map_title, - [CaseUpper] = case_map_upper, - [CaseFold] = case_map_fold, -}; -EOS - my @codepoints = keys %simple; my $range = make_ranges(\@codepoints, 500); my @case_map_lines = range_tables($range); diff --git a/src/common/unicode_case.c b/src/common/unicode_case.c index b3c6362e009..26722e9a2d9 100644 --- a/src/common/unicode_case.c +++ b/src/common/unicode_case.c @@ -27,6 +27,17 @@ enum CaseMapResult CASEMAP_SPECIAL, }; +/* + * Map for each case kind. + */ +static const pg_wchar *const casekind_map[NCaseKind] = +{ + [CaseLower] = case_map_lower, + [CaseTitle] = case_map_title, + [CaseUpper] = case_map_upper, + [CaseFold] = case_map_fold, +}; + static pg_wchar find_case_map(pg_wchar ucs, const pg_wchar *map); static size_t convert_case(char *dst, size_t dstsize, const char *src, ssize_t srclen, CaseKind str_casekind, bool full, WordBoundaryNext wbnext, diff --git a/src/include/common/unicode_case_table.h b/src/include/common/unicode_case_table.h index 5b33f64a666..aa66c3df73c 100644 --- a/src/include/common/unicode_case_table.h +++ b/src/include/common/unicode_case_table.h @@ -8592,17 +8592,6 @@ static const uint8 case_map_special[1677] = }; -/* - * Map for each case kind. - */ -static const pg_wchar *casekind_map[NCaseKind] = -{ - [CaseLower] = case_map_lower, - [CaseTitle] = case_map_title, - [CaseUpper] = case_map_upper, - [CaseFold] = case_map_fold, -}; - /* * Used by case_index() to map a codepoint to an index that can be used in any * of the following arrays: case_map_lower, case_map_title, case_map_upper, -- 2.39.5