aboutsummaryrefslogtreecommitdiff
path: root/src/include/utils
diff options
context:
space:
mode:
authorJeff Davis <jdavis@postgresql.org>2024-09-24 15:15:03 -0700
committerJeff Davis <jdavis@postgresql.org>2024-09-24 15:15:18 -0700
commitac30021356e7aa05a069741d17c3db3e8d520933 (patch)
treec2c6026a3c1827ac61f88baa0e7ea812125d5222 /src/include/utils
parent1591b38d17c55015403f6e3c9461538ffcf704e7 (diff)
downloadpostgresql-ac30021356e7aa05a069741d17c3db3e8d520933.tar.gz
postgresql-ac30021356e7aa05a069741d17c3db3e8d520933.zip
Allow length=-1 for NUL-terminated input to pg_strncoll(), etc.
Like ICU, allow a length of -1 to be specified for NUL-terminated arguments to pg_strncoll(), pg_strnxfrm(), and pg_strnxfrm_prefix(). Simplifies the code and comments. Discussion: https://postgr.es/m/2d758e07dff26bcc7cbe2aec57431329bfe3679a.camel@j-davis.com
Diffstat (limited to 'src/include/utils')
-rw-r--r--src/include/utils/pg_locale.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index c2d95411e0a..3b443df8014 100644
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -109,18 +109,18 @@ extern pg_locale_t pg_newlocale_from_collation(Oid collid);
extern char *get_collation_actual_version(char collprovider, const char *collcollate);
extern int pg_strcoll(const char *arg1, const char *arg2, pg_locale_t locale);
-extern int pg_strncoll(const char *arg1, size_t len1,
- const char *arg2, size_t len2, pg_locale_t locale);
+extern int pg_strncoll(const char *arg1, ssize_t len1,
+ const char *arg2, ssize_t len2, pg_locale_t locale);
extern bool pg_strxfrm_enabled(pg_locale_t locale);
extern size_t pg_strxfrm(char *dest, const char *src, size_t destsize,
pg_locale_t locale);
extern size_t pg_strnxfrm(char *dest, size_t destsize, const char *src,
- size_t srclen, pg_locale_t locale);
+ ssize_t srclen, pg_locale_t locale);
extern bool pg_strxfrm_prefix_enabled(pg_locale_t locale);
extern size_t pg_strxfrm_prefix(char *dest, const char *src, size_t destsize,
pg_locale_t locale);
extern size_t pg_strnxfrm_prefix(char *dest, size_t destsize, const char *src,
- size_t srclen, pg_locale_t locale);
+ ssize_t srclen, pg_locale_t locale);
extern int builtin_locale_encoding(const char *locale);
extern const char *builtin_validate_locale(int encoding, const char *locale);