Apply unconstify() in more places

petere · petere · commit 0a8590b2a09e · 2018-10-25T01:02:46.000+01:00
Discussion: https://www.postgresql.org/message-id/08adbe4e-38f8-2c73-55f0-591392371687%402ndquadrant.com
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -207,12 +207,12 @@ IsValidJsonNumber(const char *str, int len)
 	 */
 	if (*str == '-')
 	{
-		dummy_lex.input = (char *) str + 1;
+		dummy_lex.input = unconstify(char *, str) + 1;
 		dummy_lex.input_length = len - 1;
 	}
 	else
 	{
-		dummy_lex.input = (char *) str;
+		dummy_lex.input = unconstify(char *, str);
 		dummy_lex.input_length = len;
 	}
 
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
@@ -423,7 +423,7 @@ pg_get_keywords(PG_FUNCTION_ARGS)
 		HeapTuple	tuple;
 
 		/* cast-away-const is ugly but alternatives aren't much better */
-		values[0] = (char *) ScanKeywords[funcctx->call_cntr].name;
+		values[0] = unconstify(char *, ScanKeywords[funcctx->call_cntr].name);
 
 		switch (ScanKeywords[funcctx->call_cntr].category)
 		{
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -182,7 +182,7 @@ char *
 text_to_cstring(const text *t)
 {
 	/* must cast away the const, unfortunately */
-	text	   *tunpacked = pg_detoast_datum_packed((struct varlena *) t);
+	text	   *tunpacked = pg_detoast_datum_packed(unconstify(text *, t));
 	int			len = VARSIZE_ANY_EXHDR(tunpacked);
 	char	   *result;
 
@@ -213,7 +213,7 @@ void
 text_to_cstring_buffer(const text *src, char *dst, size_t dst_len)
 {
 	/* must cast away the const, unfortunately */
-	text	   *srcunpacked = pg_detoast_datum_packed((struct varlena *) src);
+	text	   *srcunpacked = pg_detoast_datum_packed(unconstify(text *, src));
 	size_t		src_len = VARSIZE_ANY_EXHDR(srcunpacked);
 
 	if (dst_len > 0)
diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c
@@ -183,7 +183,7 @@ pgwin32_setlocale(int category, const char *locale)
 	 * forbidden to modify, so casting away the "const" is innocuous.
 	 */
 	if (result)
-		result = (char *) map_locale(locale_map_result, result);
+		result = unconstify(char *, map_locale(locale_map_result, result));
 
 	return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -207,12 +207,12 @@ IsValidJsonNumber(const char *str, int len)`
`207`	`207`	`*/`
`208`	`208`	`if (*str == '-')`
`209`	`209`	`{`
`210`		`- dummy_lex.input = (char *) str + 1;`
	`210`	`+ dummy_lex.input = unconstify(char *, str) + 1;`
`211`	`211`	`dummy_lex.input_length = len - 1;`
`212`	`212`	`}`
`213`	`213`	`else`
`214`	`214`	`{`
`215`		`- dummy_lex.input = (char *) str;`
	`215`	`+ dummy_lex.input = unconstify(char *, str);`
`216`	`216`	`dummy_lex.input_length = len;`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ pg_get_keywords(PG_FUNCTION_ARGS)`
`423`	`423`	`HeapTuple tuple;`
`424`	`424`
`425`	`425`	`/* cast-away-const is ugly but alternatives aren't much better */`
`426`		`- values[0] = (char *) ScanKeywords[funcctx->call_cntr].name;`
	`426`	`+ values[0] = unconstify(char *, ScanKeywords[funcctx->call_cntr].name);`
`427`	`427`
`428`	`428`	`switch (ScanKeywords[funcctx->call_cntr].category)`
`429`	`429`	`{`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ pgwin32_setlocale(int category, const char *locale)`
`183`	`183`	`* forbidden to modify, so casting away the "const" is innocuous.`
`184`	`184`	`*/`
`185`	`185`	`if (result)`
`186`		`- result = (char *) map_locale(locale_map_result, result);`
	`186`	`+ result = unconstify(char *, map_locale(locale_map_result, result));`
`187`	`187`
`188`	`188`	`return result;`
`189`	`189`	`}`