From 19610d71cbd87898c0008130f7370e14d517e64e Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 7 Oct 2024 13:36:44 -0700 Subject: [PATCH v6 09/11] Make provider data in pg_locale_t an opaque pointer. --- src/backend/utils/adt/pg_locale.c | 10 +- src/backend/utils/adt/pg_locale_icu.c | 40 ++++++-- src/backend/utils/adt/pg_locale_libc.c | 131 ++++++++++++++++--------- src/include/utils/pg_locale.h | 16 +-- 4 files changed, 126 insertions(+), 71 deletions(-) diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 5a06c2ec58..7bc27b3005 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -127,6 +127,11 @@ static pg_locale_t default_locale = NULL; static bool CurrentLocaleConvValid = false; static bool CurrentLCTimeValid = false; +struct builtin_provider +{ + const char *locale; +}; + /* Cache for collation-related knowledge */ typedef struct @@ -1330,6 +1335,7 @@ create_pg_locale_builtin(Oid collid, MemoryContext context) { const char *locstr; pg_locale_t result; + struct builtin_provider *builtin; if (collid == DEFAULT_COLLATION_OID) { @@ -1361,8 +1367,10 @@ create_pg_locale_builtin(Oid collid, MemoryContext context) builtin_validate_locale(GetDatabaseEncoding(), locstr); result = MemoryContextAllocZero(context, sizeof(struct pg_locale_struct)); + builtin = MemoryContextAlloc(context, sizeof(struct builtin_provider)); + builtin->locale = MemoryContextStrdup(context, locstr); + result->provider_data = (void *) builtin; - result->info.builtin.locale = MemoryContextStrdup(context, locstr); result->deterministic = true; result->collate_is_c = true; result->ctype_is_c = (strcmp(locstr, "C") == 0); diff --git a/src/backend/utils/adt/pg_locale_icu.c b/src/backend/utils/adt/pg_locale_icu.c index e7ef7f4c09..2d47faf3aa 100644 --- a/src/backend/utils/adt/pg_locale_icu.c +++ b/src/backend/utils/adt/pg_locale_icu.c @@ -37,6 +37,12 @@ extern pg_locale_t create_pg_locale_icu(Oid collid, MemoryContext context); #ifdef USE_ICU +struct icu_provider +{ + const char *locale; + UCollator *ucol; +}; + extern UCollator *pg_ucol_open(const char *loc_str); static int strncoll_icu(const char *arg1, ssize_t len1, @@ -190,6 +196,7 @@ create_pg_locale_icu(Oid collid, MemoryContext context) bool deterministic; const char *iculocstr; const char *icurules = NULL; + struct icu_provider *icu; UCollator *collator; pg_locale_t result; @@ -241,8 +248,12 @@ create_pg_locale_icu(Oid collid, MemoryContext context) collator = make_icu_collator(iculocstr, icurules); result = MemoryContextAllocZero(context, sizeof(struct pg_locale_struct)); - result->info.icu.locale = MemoryContextStrdup(context, iculocstr); - result->info.icu.ucol = collator; + + icu = MemoryContextAllocZero(context, sizeof(struct icu_provider)); + icu->locale = MemoryContextStrdup(context, iculocstr); + icu->ucol = collator; + result->provider_data = (void *) icu; + result->deterministic = deterministic; result->collate_is_c = false; result->ctype_is_c = false; @@ -499,11 +510,12 @@ strncoll_icu_utf8(const char *arg1, ssize_t len1, const char *arg2, ssize_t len2 { int result; UErrorCode status; + struct icu_provider *icu = (struct icu_provider *) locale->provider_data; Assert(GetDatabaseEncoding() == PG_UTF8); status = U_ZERO_ERROR; - result = ucol_strcollUTF8(locale->info.icu.ucol, + result = ucol_strcollUTF8(icu->ucol, arg1, len1, arg2, len2, &status); @@ -527,6 +539,8 @@ strnxfrm_icu(char *dest, size_t destsize, const char *src, ssize_t srclen, size_t uchar_bsize; Size result_bsize; + struct icu_provider *icu = (struct icu_provider *) locale->provider_data; + init_icu_converter(); ulen = uchar_length(icu_converter, src, srclen); @@ -540,7 +554,7 @@ strnxfrm_icu(char *dest, size_t destsize, const char *src, ssize_t srclen, ulen = uchar_convert(icu_converter, uchar, ulen + 1, src, srclen); - result_bsize = ucol_getSortKey(locale->info.icu.ucol, + result_bsize = ucol_getSortKey(icu->ucol, uchar, ulen, (uint8_t *) dest, destsize); @@ -571,12 +585,14 @@ strnxfrm_prefix_icu_utf8(char *dest, size_t destsize, uint32_t state[2]; UErrorCode status; + struct icu_provider *icu = (struct icu_provider *) locale->provider_data; + Assert(GetDatabaseEncoding() == PG_UTF8); uiter_setUTF8(&iter, src, srclen); state[0] = state[1] = 0; /* won't need that again */ status = U_ZERO_ERROR; - result = ucol_nextSortKeyPart(locale->info.icu.ucol, + result = ucol_nextSortKeyPart(icu->ucol, &iter, state, (uint8_t *) dest, @@ -667,11 +683,13 @@ icu_convert_case(ICU_Convert_Func func, pg_locale_t mylocale, UErrorCode status; int32_t len_dest; + struct icu_provider *icu = (struct icu_provider *) mylocale->provider_data; + len_dest = len_source; /* try first with same length */ *buff_dest = palloc(len_dest * sizeof(**buff_dest)); status = U_ZERO_ERROR; len_dest = func(*buff_dest, len_dest, buff_source, len_source, - mylocale->info.icu.locale, &status); + icu->locale, &status); if (status == U_BUFFER_OVERFLOW_ERROR) { /* try again with adjusted length */ @@ -679,7 +697,7 @@ icu_convert_case(ICU_Convert_Func func, pg_locale_t mylocale, *buff_dest = palloc(len_dest * sizeof(**buff_dest)); status = U_ZERO_ERROR; len_dest = func(*buff_dest, len_dest, buff_source, len_source, - mylocale->info.icu.locale, &status); + icu->locale, &status); } if (U_FAILURE(status)) ereport(ERROR, @@ -721,6 +739,8 @@ strncoll_icu(const char *arg1, ssize_t len1, *uchar2; int result; + struct icu_provider *icu = (struct icu_provider *) locale->provider_data; + /* if encoding is UTF8, use more efficient strncoll_icu_utf8 */ #ifdef HAVE_UCOL_STRCOLLUTF8 Assert(GetDatabaseEncoding() != PG_UTF8); @@ -743,7 +763,7 @@ strncoll_icu(const char *arg1, ssize_t len1, ulen1 = uchar_convert(icu_converter, uchar1, ulen1 + 1, arg1, len1); ulen2 = uchar_convert(icu_converter, uchar2, ulen2 + 1, arg2, len2); - result = ucol_strcoll(locale->info.icu.ucol, + result = ucol_strcoll(icu->ucol, uchar1, ulen1, uchar2, ulen2); @@ -769,6 +789,8 @@ strnxfrm_prefix_icu(char *dest, size_t destsize, size_t uchar_bsize; Size result_bsize; + struct icu_provider *icu = (struct icu_provider *) locale->provider_data; + /* if encoding is UTF8, use more efficient strnxfrm_prefix_icu_utf8 */ Assert(GetDatabaseEncoding() != PG_UTF8); @@ -788,7 +810,7 @@ strnxfrm_prefix_icu(char *dest, size_t destsize, uiter_setString(&iter, uchar, ulen); state[0] = state[1] = 0; /* won't need that again */ status = U_ZERO_ERROR; - result_bsize = ucol_nextSortKeyPart(locale->info.icu.ucol, + result_bsize = ucol_nextSortKeyPart(icu->ucol, &iter, state, (uint8_t *) dest, diff --git a/src/backend/utils/adt/pg_locale_libc.c b/src/backend/utils/adt/pg_locale_libc.c index 77220e134a..c08102002f 100644 --- a/src/backend/utils/adt/pg_locale_libc.c +++ b/src/backend/utils/adt/pg_locale_libc.c @@ -1,3 +1,4 @@ + /*----------------------------------------------------------------------- * * PostgreSQL locale utilities for libc @@ -31,6 +32,11 @@ */ #define TEXTBUFLEN 1024 +struct libc_provider +{ + locale_t lt; +}; + extern pg_locale_t create_pg_locale_libc(Oid collid, MemoryContext context); static int strncoll_libc(const char *arg1, ssize_t len1, @@ -116,17 +122,21 @@ char_is_cased_libc(char ch, pg_locale_t locale) { bool is_multibyte = pg_database_encoding_max_length() > 1; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + if (is_multibyte && IS_HIGHBIT_SET(ch)) return true; else - return isalpha_l((unsigned char) ch, locale->info.lt); + return isalpha_l((unsigned char) ch, libc->lt); } static char char_tolower_libc(unsigned char ch, pg_locale_t locale) { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(pg_database_encoding_max_length() == 1); - return tolower_l(ch, locale->info.lt); + return tolower_l(ch, libc->lt); } static const struct casemap_methods casemap_methods_libc_sb = { @@ -167,7 +177,7 @@ strlower_libc_sb(char *dest, size_t destsize, const char *src, ssize_t srclen, if (srclen + 1 <= destsize) { - locale_t loc = locale->info.lt; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; char *p; if (srclen + 1 > destsize) @@ -184,7 +194,7 @@ strlower_libc_sb(char *dest, size_t destsize, const char *src, ssize_t srclen, * what the collation says. */ for (p = dest; *p; p++) - *p = tolower_l((unsigned char) *p, loc); + *p = tolower_l((unsigned char) *p, libc->lt); } return srclen; @@ -194,7 +204,8 @@ static size_t strlower_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen, pg_locale_t locale) { - locale_t loc = locale->info.lt; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + size_t result_size; wchar_t *workspace; char *result; @@ -216,7 +227,7 @@ strlower_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen, char2wchar(workspace, srclen + 1, src, srclen, locale); for (curr_char = 0; workspace[curr_char] != 0; curr_char++) - workspace[curr_char] = towlower_l(workspace[curr_char], loc); + workspace[curr_char] = towlower_l(workspace[curr_char], libc->lt); /* * Make result large enough; case change might change number of bytes @@ -247,7 +258,7 @@ strtitle_libc_sb(char *dest, size_t destsize, const char *src, ssize_t srclen, if (srclen + 1 <= destsize) { - locale_t loc = locale->info.lt; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; int wasalnum = false; char *p; @@ -264,10 +275,10 @@ strtitle_libc_sb(char *dest, size_t destsize, const char *src, ssize_t srclen, for (p = dest; *p; p++) { if (wasalnum) - *p = tolower_l((unsigned char) *p, loc); + *p = tolower_l((unsigned char) *p, libc->lt); else - *p = toupper_l((unsigned char) *p, loc); - wasalnum = isalnum_l((unsigned char) *p, loc); + *p = toupper_l((unsigned char) *p, libc->lt); + wasalnum = isalnum_l((unsigned char) *p, libc->lt); } } @@ -278,7 +289,8 @@ static size_t strtitle_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen, pg_locale_t locale) { - locale_t loc = locale->info.lt; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + int wasalnum = false; size_t result_size; wchar_t *workspace; @@ -303,10 +315,10 @@ strtitle_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen, for (curr_char = 0; workspace[curr_char] != 0; curr_char++) { if (wasalnum) - workspace[curr_char] = towlower_l(workspace[curr_char], loc); + workspace[curr_char] = towlower_l(workspace[curr_char], libc->lt); else - workspace[curr_char] = towupper_l(workspace[curr_char], loc); - wasalnum = iswalnum_l(workspace[curr_char], loc); + workspace[curr_char] = towupper_l(workspace[curr_char], libc->lt); + wasalnum = iswalnum_l(workspace[curr_char], libc->lt); } /* @@ -338,7 +350,7 @@ strupper_libc_sb(char *dest, size_t destsize, const char *src, ssize_t srclen, if (srclen + 1 <= destsize) { - locale_t loc = locale->info.lt; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; char *p; memcpy(dest, src, srclen); @@ -352,7 +364,7 @@ strupper_libc_sb(char *dest, size_t destsize, const char *src, ssize_t srclen, * what the collation says. */ for (p = dest; *p; p++) - *p = toupper_l((unsigned char) *p, loc); + *p = toupper_l((unsigned char) *p, libc->lt); } return srclen; @@ -362,7 +374,8 @@ static size_t strupper_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen, pg_locale_t locale) { - locale_t loc = locale->info.lt; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + size_t result_size; wchar_t *workspace; char *result; @@ -384,7 +397,7 @@ strupper_libc_mb(char *dest, size_t destsize, const char *src, ssize_t srclen, char2wchar(workspace, srclen + 1, src, srclen, locale); for (curr_char = 0; workspace[curr_char] != 0; curr_char++) - workspace[curr_char] = towupper_l(workspace[curr_char], loc); + workspace[curr_char] = towupper_l(workspace[curr_char], libc->lt); /* * Make result large enough; case change might change number of bytes @@ -412,6 +425,7 @@ create_pg_locale_libc(Oid collid, MemoryContext context) const char *collate; const char *ctype; locale_t loc; + struct libc_provider *libc; pg_locale_t result; if (collid == DEFAULT_COLLATION_OID) @@ -450,16 +464,19 @@ create_pg_locale_libc(Oid collid, MemoryContext context) ReleaseSysCache(tp); } - loc = make_libc_collator(collate, ctype); result = MemoryContextAllocZero(context, sizeof(struct pg_locale_struct)); + + libc = MemoryContextAllocZero(context, sizeof(struct libc_provider)); + libc->lt = loc; + result->provider_data = (void *) libc; + result->deterministic = true; result->collate_is_c = (strcmp(collate, "C") == 0) || (strcmp(collate, "POSIX") == 0); result->ctype_is_c = (strcmp(ctype, "C") == 0) || (strcmp(ctype, "POSIX") == 0); - result->info.lt = loc; if (!result->collate_is_c) { #ifdef WIN32 @@ -578,6 +595,8 @@ strncoll_libc(const char *arg1, ssize_t len1, const char *arg2, ssize_t len2, const char *arg2n; int result; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + if (bufsize1 + bufsize2 > TEXTBUFLEN) buf = palloc(bufsize1 + bufsize2); @@ -608,7 +627,7 @@ strncoll_libc(const char *arg1, ssize_t len1, const char *arg2, ssize_t len2, arg2n = buf2; } - result = strcoll_l(arg1n, arg2n, locale->info.lt); + result = strcoll_l(arg1n, arg2n, libc->lt); if (buf != sbuf) pfree(buf); @@ -632,8 +651,10 @@ strnxfrm_libc(char *dest, size_t destsize, const char *src, ssize_t srclen, size_t bufsize = srclen + 1; size_t result; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + if (srclen == -1) - return strxfrm_l(dest, src, destsize, locale->info.lt); + return strxfrm_l(dest, src, destsize, libc->lt); if (bufsize > TEXTBUFLEN) buf = palloc(bufsize); @@ -642,7 +663,7 @@ strnxfrm_libc(char *dest, size_t destsize, const char *src, ssize_t srclen, memcpy(buf, src, srclen); buf[srclen] = '\0'; - result = strxfrm_l(dest, buf, destsize, locale->info.lt); + result = strxfrm_l(dest, buf, destsize, libc->lt); if (buf != sbuf) pfree(buf); @@ -675,6 +696,8 @@ strncoll_libc_win32_utf8(const char *arg1, ssize_t len1, const char *arg2, int r; int result; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(GetDatabaseEncoding() == PG_UTF8); if (len1 == -1) @@ -719,7 +742,7 @@ strncoll_libc_win32_utf8(const char *arg1, ssize_t len1, const char *arg2, ((LPWSTR) a2p)[r] = 0; errno = 0; - result = wcscoll_l((LPWSTR) a1p, (LPWSTR) a2p, locale->info.lt); + result = wcscoll_l((LPWSTR) a1p, (LPWSTR) a2p, libc->lt); if (result == 2147483647) /* _NLSCMPERROR; missing from mingw headers */ ereport(ERROR, (errmsg("could not compare Unicode strings: %m"))); @@ -766,27 +789,29 @@ char_properties_libc_1byte(pg_wchar wc, int mask, pg_locale_t locale) { int result = 0; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(!locale->ctype_is_c); Assert(GetDatabaseEncoding() != PG_UTF8); if (wc > (pg_wchar) UCHAR_MAX) return 0; - if ((mask & PG_ISDIGIT) && isdigit_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISDIGIT) && isdigit_l((unsigned char) wc, libc->lt)) result |= PG_ISDIGIT; - if ((mask & PG_ISALPHA) && isalpha_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISALPHA) && isalpha_l((unsigned char) wc, libc->lt)) result |= PG_ISALPHA; - if ((mask & PG_ISUPPER) && isupper_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISUPPER) && isupper_l((unsigned char) wc, libc->lt)) result |= PG_ISUPPER; - if ((mask & PG_ISLOWER) && islower_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISLOWER) && islower_l((unsigned char) wc, libc->lt)) result |= PG_ISLOWER; - if ((mask & PG_ISGRAPH) && isgraph_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISGRAPH) && isgraph_l((unsigned char) wc, libc->lt)) result |= PG_ISGRAPH; - if ((mask & PG_ISPRINT) && isprint_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISPRINT) && isprint_l((unsigned char) wc, libc->lt)) result |= PG_ISPRINT; - if ((mask & PG_ISPUNCT) && ispunct_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISPUNCT) && ispunct_l((unsigned char) wc, libc->lt)) result |= PG_ISPUNCT; - if ((mask & PG_ISSPACE) && isspace_l((unsigned char) wc, locale->info.lt)) + if ((mask & PG_ISSPACE) && isspace_l((unsigned char) wc, libc->lt)) result |= PG_ISSPACE; return result; @@ -797,6 +822,8 @@ char_properties_libc_wide(pg_wchar wc, int mask, pg_locale_t locale) { int result = 0; + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(!locale->ctype_is_c); Assert(GetDatabaseEncoding() == PG_UTF8); @@ -804,21 +831,21 @@ char_properties_libc_wide(pg_wchar wc, int mask, pg_locale_t locale) if (sizeof(wchar_t) < 4 && wc > (pg_wchar) 0xFFFF) return 0; - if ((mask & PG_ISDIGIT) && iswdigit_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISDIGIT) && iswdigit_l((wint_t) wc, libc->lt)) result |= PG_ISDIGIT; - if ((mask & PG_ISALPHA) && iswalpha_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISALPHA) && iswalpha_l((wint_t) wc, libc->lt)) result |= PG_ISALPHA; - if ((mask & PG_ISUPPER) && iswupper_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISUPPER) && iswupper_l((wint_t) wc, libc->lt)) result |= PG_ISUPPER; - if ((mask & PG_ISLOWER) && iswlower_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISLOWER) && iswlower_l((wint_t) wc, libc->lt)) result |= PG_ISLOWER; - if ((mask & PG_ISGRAPH) && iswgraph_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISGRAPH) && iswgraph_l((wint_t) wc, libc->lt)) result |= PG_ISGRAPH; - if ((mask & PG_ISPRINT) && iswprint_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISPRINT) && iswprint_l((wint_t) wc, libc->lt)) result |= PG_ISPRINT; - if ((mask & PG_ISPUNCT) && iswpunct_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISPUNCT) && iswpunct_l((wint_t) wc, libc->lt)) result |= PG_ISPUNCT; - if ((mask & PG_ISSPACE) && iswspace_l((wint_t) wc, locale->info.lt)) + if ((mask & PG_ISSPACE) && iswspace_l((wint_t) wc, libc->lt)) result |= PG_ISSPACE; return result; @@ -827,10 +854,12 @@ char_properties_libc_wide(pg_wchar wc, int mask, pg_locale_t locale) static pg_wchar toupper_libc_1byte(pg_wchar wc, pg_locale_t locale) { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(GetDatabaseEncoding() != PG_UTF8); if (wc <= (pg_wchar) UCHAR_MAX) - return toupper_l((unsigned char) wc, locale->info.lt); + return toupper_l((unsigned char) wc, libc->lt); else return wc; } @@ -838,10 +867,12 @@ toupper_libc_1byte(pg_wchar wc, pg_locale_t locale) static pg_wchar toupper_libc_wide(pg_wchar wc, pg_locale_t locale) { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(GetDatabaseEncoding() == PG_UTF8); if (sizeof(wchar_t) >= 4 || wc <= (pg_wchar) 0xFFFF) - return towupper_l((wint_t) wc, locale->info.lt); + return towupper_l((wint_t) wc, libc->lt); else return wc; } @@ -849,10 +880,12 @@ toupper_libc_wide(pg_wchar wc, pg_locale_t locale) static pg_wchar tolower_libc_1byte(pg_wchar wc, pg_locale_t locale) { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(GetDatabaseEncoding() != PG_UTF8); if (wc <= (pg_wchar) UCHAR_MAX) - return tolower_l((unsigned char) wc, locale->info.lt); + return tolower_l((unsigned char) wc, libc->lt); else return wc; } @@ -860,10 +893,12 @@ tolower_libc_1byte(pg_wchar wc, pg_locale_t locale) static pg_wchar tolower_libc_wide(pg_wchar wc, pg_locale_t locale) { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + Assert(GetDatabaseEncoding() == PG_UTF8); if (sizeof(wchar_t) >= 4 || wc <= (pg_wchar) 0xFFFF) - return towlower_l((wint_t) wc, locale->info.lt); + return towlower_l((wint_t) wc, libc->lt); else return wc; } @@ -955,8 +990,10 @@ wchar2char(char *to, const wchar_t *from, size_t tolen, pg_locale_t locale) } else { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + /* Use wcstombs_l for nondefault locales */ - result = wcstombs_l(to, from, tolen, locale->info.lt); + result = wcstombs_l(to, from, tolen, libc->lt); } return result; @@ -1015,8 +1052,10 @@ char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen, } else { + struct libc_provider *libc = (struct libc_provider *) locale->provider_data; + /* Use mbstowcs_l for nondefault locales */ - result = mbstowcs_l(to, str, tolen, locale->info.lt); + result = mbstowcs_l(to, str, tolen, libc->lt); } pfree(str); diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index deb035cfd0..e8a6e0d364 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -171,21 +171,7 @@ struct pg_locale_struct const struct casemap_methods *casemap; /* NULL if ctype_is_c */ const struct ctype_methods *ctype; /* NULL if ctype_is_c */ - union - { - struct - { - const char *locale; - } builtin; - locale_t lt; -#ifdef USE_ICU - struct - { - const char *locale; - UCollator *ucol; - } icu; -#endif - } info; + void *provider_data; }; typedef struct pg_locale_struct *pg_locale_t; -- 2.34.1