From e1c6414fcabd075b33a4ee1edbd3231b657c9e65 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 7 Oct 2024 13:36:44 -0700 Subject: [PATCH v8 5/7] Make provider data in pg_locale_t an opaque pointer. --- src/backend/utils/adt/pg_locale_builtin.c | 11 +- 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, 127 insertions(+), 71 deletions(-) diff --git a/src/backend/utils/adt/pg_locale_builtin.c b/src/backend/utils/adt/pg_locale_builtin.c index b4abde1afd..a1eb0e459c 100644 --- a/src/backend/utils/adt/pg_locale_builtin.c +++ b/src/backend/utils/adt/pg_locale_builtin.c @@ -25,6 +25,11 @@ extern pg_locale_t create_pg_locale_builtin(Oid collid, MemoryContext context); +struct builtin_provider +{ + const char *locale; +}; + struct WordBoundaryState { const char *str; @@ -154,6 +159,7 @@ pg_locale_t create_pg_locale_builtin(Oid collid, MemoryContext context) { const char *locstr; + struct builtin_provider *builtin; pg_locale_t result; if (collid == DEFAULT_COLLATION_OID) @@ -187,7 +193,10 @@ create_pg_locale_builtin(Oid collid, MemoryContext context) result = MemoryContextAllocZero(context, sizeof(struct pg_locale_struct)); - result->info.builtin.locale = MemoryContextStrdup(context, locstr); + builtin = MemoryContextAllocZero(context, sizeof(struct builtin_provider)); + builtin->locale = MemoryContextStrdup(context, locstr); + result->provider_data = (void *) builtin; + 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 7a2ca8ac84..57f366f741 100644 --- a/src/backend/utils/adt/pg_locale_icu.c +++ b/src/backend/utils/adt/pg_locale_icu.c @@ -39,6 +39,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, @@ -189,6 +195,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; @@ -240,8 +247,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; @@ -497,11 +508,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); @@ -525,6 +537,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); @@ -538,7 +552,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); @@ -569,12 +583,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, @@ -665,11 +681,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 */ @@ -677,7 +695,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, @@ -719,6 +737,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); @@ -741,7 +761,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); @@ -767,6 +787,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); @@ -786,7 +808,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 7708e9de96..8738a0221b 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 @@ -33,6 +34,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, @@ -118,17 +124,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 ctype_methods ctype_methods_libc_sb = { @@ -179,7 +189,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) @@ -196,7 +206,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; @@ -206,7 +216,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; @@ -228,7 +239,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 @@ -259,7 +270,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; @@ -276,10 +287,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); } } @@ -290,7 +301,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; @@ -315,10 +327,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); } /* @@ -350,7 +362,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); @@ -364,7 +376,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; @@ -374,7 +386,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; @@ -396,7 +409,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 @@ -424,6 +437,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) @@ -462,16 +476,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 @@ -585,6 +602,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); @@ -615,7 +634,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); @@ -639,8 +658,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); @@ -649,7 +670,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); @@ -682,6 +703,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) @@ -726,7 +749,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"))); @@ -773,27 +796,29 @@ char_properties_libc_sb(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; @@ -804,6 +829,8 @@ char_properties_libc_mb(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); @@ -811,21 +838,21 @@ char_properties_libc_mb(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; @@ -834,10 +861,12 @@ char_properties_libc_mb(pg_wchar wc, int mask, pg_locale_t locale) static pg_wchar toupper_libc_sb(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; } @@ -845,10 +874,12 @@ toupper_libc_sb(pg_wchar wc, pg_locale_t locale) static pg_wchar toupper_libc_mb(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; } @@ -856,10 +887,12 @@ toupper_libc_mb(pg_wchar wc, pg_locale_t locale) static pg_wchar tolower_libc_sb(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; } @@ -867,10 +900,12 @@ tolower_libc_sb(pg_wchar wc, pg_locale_t locale) static pg_wchar tolower_libc_mb(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; } @@ -962,8 +997,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; @@ -1022,8 +1059,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 98a860d0b3..c4c19a3c82 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -167,21 +167,7 @@ struct pg_locale_struct const struct collate_methods *collate; /* NULL if collate_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