diff options
| author | Jeff Davis | 2025-06-11 22:03:52 +0000 |
|---|---|---|
| committer | Jeff Davis | 2025-06-11 22:10:12 +0000 |
| commit | e1458f2f1b56cfe07b3e8fc99b223ea8c852d7ce (patch) | |
| tree | f7a40b7f864716aaeb2cfd46b8dbaeb100ee3a09 | |
| parent | b774ad49336764aef063b9dbc1e7b7eb11c36e11 (diff) | |
Revert a few small patches that were intended for version 19.
- 4c787a24e7e220a60022e47c1776f22f72902899
- 78bd364ee39ca70a8f9cb8719282389866a08e14
- 7a6880fadc177873d5663961ec3a02d67e34dcbe
- 8898082a5d3e94eef073f0e08124137e096e78ef
Suggested-by: Robert Haas <[email protected]>
Discussion: https://postgr.es/m/CA+TgmoZ=J=PVNZUNKaxULu+KUVSt3Y-aJ1DZ9Y3Co6mu0z62jA@mail.gmail.com
Discussion: https://postgr.es/m/[email protected]
| -rw-r--r-- | contrib/isn/isn.c | 4 | ||||
| -rw-r--r-- | contrib/spi/refint.c | 2 | ||||
| -rw-r--r-- | src/backend/commands/copyfromparse.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/inet_net_pton.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c index 1880c91844e..038c8ed4db7 100644 --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -726,7 +726,7 @@ string2ean(const char *str, struct Node *escontext, ean13 *result, if (type != INVALID) goto eaninvalid; type = ISSN; - *aux1++ = pg_ascii_toupper((unsigned char) *aux2); + *aux1++ = toupper((unsigned char) *aux2); length++; } else if (length == 9 && (digit || *aux2 == 'X' || *aux2 == 'x') && last) @@ -736,7 +736,7 @@ string2ean(const char *str, struct Node *escontext, ean13 *result, goto eaninvalid; if (type == INVALID) type = ISBN; /* ISMN must start with 'M' */ - *aux1++ = pg_ascii_toupper((unsigned char) *aux2); + *aux1++ = toupper((unsigned char) *aux2); length++; } else if (length == 11 && digit && last) diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index 89898cad7b0..d5e25e07ae9 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -321,7 +321,7 @@ check_foreign_key(PG_FUNCTION_ARGS) if (nrefs < 1) /* internal error */ elog(ERROR, "check_foreign_key: %d (< 1) number of references specified", nrefs); - action = pg_ascii_tolower((unsigned char) *(args[1])); + action = tolower((unsigned char) *(args[1])); if (action != 'r' && action != 'c' && action != 's') /* internal error */ elog(ERROR, "check_foreign_key: invalid action %s", args[1]); diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c index f52f2477df1..f5fc346e201 100644 --- a/src/backend/commands/copyfromparse.c +++ b/src/backend/commands/copyfromparse.c @@ -1538,7 +1538,7 @@ GetDecimalFromHex(char hex) if (isdigit((unsigned char) hex)) return hex - '0'; else - return pg_ascii_tolower((unsigned char) hex) - 'a' + 10; + return tolower((unsigned char) hex) - 'a' + 10; } /* diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index 3b0db2a3799..ef2236d9f04 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -115,7 +115,8 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size) src++; /* skip x or X. */ while ((ch = *src++) != '\0' && isxdigit((unsigned char) ch)) { - ch = pg_ascii_tolower((unsigned char) ch); + if (isupper((unsigned char) ch)) + ch = tolower((unsigned char) ch); n = strchr(xdigits, ch) - xdigits; assert(n >= 0 && n <= 15); if (dirty == 0) |