Revert a few small patches that were intended for version 19.

jeff-davis · jeff-davis · commit e1458f2f1b56 · 2025-06-11T15:10:12.000-07:00
- 4c787a2 - 78bd364 - 7a6880f - 8898082 Suggested-by: Robert Haas <robertmhaas@gmail.com> Discussion: https://postgr.es/m/CA+TgmoZ=J=PVNZUNKaxULu+KUVSt3Y-aJ1DZ9Y3Co6mu0z62jA@mail.gmail.com Discussion: https://postgr.es/m/60e8c6d0a6c08e67f15dbbe9e53df0119c710065.camel@j-davis.com
diff --git 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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1538,7 +1538,7 @@ GetDecimalFromHex(char hex)`
`1538`	`1538`	`if (isdigit((unsigned char) hex))`
`1539`	`1539`	`return hex - '0';`
`1540`	`1540`	`else`
`1541`		`- return pg_ascii_tolower((unsigned char) hex) - 'a' + 10;`
	`1541`	`+ return tolower((unsigned char) hex) - 'a' + 10;`
`1542`	`1542`	`}`
`1543`	`1543`
`1544`	`1544`	`/*`