database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-25 13:17:41 +03:00
Code Activity

Make char2wchar() static.

Browse Source 
Reviewed-by: Peter Eisentraut <peter@eisentraut.org>
Discussion: https://postgr.es/m/0151ad01239e2cc7b3139644358cf8f7b9622ff7.camel@j-davis.com
This commit is contained in:
Jeff Davis
2025-10-21 09:32:12 -07:00
parent 844385d12e
commit ff53907c35
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/utils/adt/pg_locale_libc.c
View File

@@ -99,6 +99,9 @@ static int strncoll_libc_win32_utf8(const char *arg1, ssize_t len1,
pg_locale_t locale); pg_locale_t locale);
#endif #endif
static size_t char2wchar(wchar_t *to, size_t tolen, const char *from,
size_t fromlen, locale_t loc);
static size_t strlower_libc_sb(char *dest, size_t destsize, static size_t strlower_libc_sb(char *dest, size_t destsize,
const char *src, ssize_t srclen, const char *src, ssize_t srclen,
pg_locale_t locale); pg_locale_t locale);
@@ -1206,7 +1209,7 @@ wchar2char(char *to, const wchar_t *from, size_t tolen, locale_t loc)
* input encoding. tolen is the maximum number of wchar_t's to store at *to. * input encoding. tolen is the maximum number of wchar_t's to store at *to.
* The output will be zero-terminated iff there is room. * The output will be zero-terminated iff there is room.
*/ */
size_t static size_t
char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen, char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen,
locale_t loc) locale_t loc)
{ {

10
src/include/utils/pg_locale.h
View File

@@ -139,10 +139,8 @@ struct ctype_methods
* "default" collation, there are separate static cache variables, since * "default" collation, there are separate static cache variables, since
* consulting the pg_collation catalog doesn't tell us what we need. * consulting the pg_collation catalog doesn't tell us what we need.
* *
* Note that some code relies on the flags not reporting false negatives * Note that some code, such as wchar2char(), relies on the flags not
* (that is, saying it's not C when it is). For example, char2wchar() * reporting false negatives (that is, saying it's not C when it is).
* could fail if the locale is C, so str_tolower() shouldn't call it
* in that case.
*/ */
struct pg_locale_struct struct pg_locale_struct
{ {
@@ -226,10 +224,8 @@ extern void icu_validate_locale(const char *loc_str);
extern char *icu_language_tag(const char *loc_str, int elevel); extern char *icu_language_tag(const char *loc_str, int elevel);
extern void report_newlocale_failure(const char *localename); extern void report_newlocale_failure(const char *localename);
/* These functions convert from/to libc's wchar_t, *not* pg_wchar_t */ /* This function converts from libc's wchar_t, *not* pg_wchar_t */
extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen, extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen,
locale_t loc); locale_t loc);
extern size_t char2wchar(wchar_t *to, size_t tolen,
const char *from, size_t fromlen, locale_t loc);
#endif /* _PG_LOCALE_ */ #endif /* _PG_LOCALE_ */