On Mon, Sep 11, 2023 at 12:15:49PM -0700, Jeff Davis wrote: > That's fine with me.
Okay. Then, please find attached a v4 for HEAD and REL_16_STABLE. -- Michael
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index aa9da99308..c02fa7b203 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -2031,7 +2031,8 @@ pg_strcoll(const char *arg1, const char *arg2, pg_locale_t locale) #endif else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strcoll", locale->provider); return result; } @@ -2067,7 +2068,8 @@ pg_strncoll(const char *arg1, size_t len1, const char *arg2, size_t len2, #endif else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strncoll", locale->provider); return result; } @@ -2086,7 +2088,8 @@ pg_strxfrm_libc(char *dest, const char *src, size_t destsize, return strxfrm(dest, src, destsize); #else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strxfrm_libc", locale->provider); return 0; /* keep compiler quiet */ #endif } @@ -2282,7 +2285,8 @@ pg_strxfrm_enabled(pg_locale_t locale) return true; else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strxfrm_enabled", locale->provider); return false; /* keep compiler quiet */ } @@ -2314,7 +2318,8 @@ pg_strxfrm(char *dest, const char *src, size_t destsize, pg_locale_t locale) #endif else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strxfrm", locale->provider); return result; } @@ -2351,7 +2356,8 @@ pg_strnxfrm(char *dest, size_t destsize, const char *src, size_t srclen, #endif else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strnxfrm", locale->provider); return result; } @@ -2369,7 +2375,8 @@ pg_strxfrm_prefix_enabled(pg_locale_t locale) return true; else /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strxfrm_prefix_enabled", locale->provider); return false; /* keep compiler quiet */ } @@ -2393,17 +2400,16 @@ pg_strxfrm_prefix(char *dest, const char *src, size_t destsize, { size_t result = 0; /* keep compiler quiet */ - if (!locale || locale->provider == COLLPROVIDER_LIBC) - elog(ERROR, "collprovider '%c' does not support pg_strxfrm_prefix()", - locale->provider); + if (!locale) + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strxfrm_prefix", COLLPROVIDER_LIBC); #ifdef USE_ICU else if (locale->provider == COLLPROVIDER_ICU) result = pg_strnxfrm_prefix_icu(dest, src, -1, destsize, locale); #endif else - /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); - + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strxfrm_prefix", locale->provider); return result; } @@ -2430,16 +2436,16 @@ pg_strnxfrm_prefix(char *dest, size_t destsize, const char *src, { size_t result = 0; /* keep compiler quiet */ - if (!locale || locale->provider == COLLPROVIDER_LIBC) - elog(ERROR, "collprovider '%c' does not support pg_strnxfrm_prefix()", - locale->provider); + if (!locale) + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strnxfrm_prefix", COLLPROVIDER_LIBC); #ifdef USE_ICU else if (locale->provider == COLLPROVIDER_ICU) result = pg_strnxfrm_prefix_icu(dest, src, -1, destsize, locale); #endif else - /* shouldn't happen */ - elog(ERROR, "unsupported collprovider: %c", locale->provider); + elog(ERROR, "unsupported collprovider (%s): %c", + "pg_strnxfrm_prefix", locale->provider); return result; }
signature.asc
Description: PGP signature