Tweak clean_encoding_name() API to avoid need to cast away const.

tglsfdc · tglsfdc · commit 274dfdb51351 · 2007-04-16T18:50:49.000Z
Kris Jurka
diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c
@@ -2,7 +2,7 @@
  * Encoding names and routines for work with it. All
  * in this file is shared bedween FE and BE.
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.33 2007/04/15 10:56:25 ishii Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.34 2007/04/16 18:50:49 tgl Exp $
  */
 #ifdef FRONTEND
 #include "postgres_fe.h"
@@ -460,10 +460,10 @@ pg_valid_server_encoding(const char *name)
  * ----------
  */
 static char *
-clean_encoding_name(char *key, char *newkey)
+clean_encoding_name(const char *key, char *newkey)
 {
-	char	   *p,
-			   *np;
+	const char *p;
+	char 	   *np;
 
 	for (p = key, np = newkey; *p != '\0'; p++)
 	{
@@ -508,7 +508,7 @@ pg_char_to_encname_struct(const char *name)
 				 errmsg("encoding name too long")));
 #endif
 	}
-	key = clean_encoding_name((char *) name, buff);
+	key = clean_encoding_name(name, buff);
 
 	while (last >= base)
 	{

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Encoding names and routines for work with it. All`
`3`	`3`	`* in this file is shared bedween FE and BE.`
`4`	`4`	`*`
`5`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.33 2007/04/15 10:56:25 ishii Exp $`
	`5`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.34 2007/04/16 18:50:49 tgl Exp $`
`6`	`6`	`*/`
`7`	`7`	`#ifdef FRONTEND`
`8`	`8`	`#include "postgres_fe.h"`
`@@ -460,10 +460,10 @@ pg_valid_server_encoding(const char *name)`
`460`	`460`	`* ----------`
`461`	`461`	`*/`
`462`	`462`	`static char *`
`463`		`-clean_encoding_name(char key, char newkey)`
	`463`	`+clean_encoding_name(const char key, char newkey)`
`464`	`464`	`{`
`465`		`- char *p,`
`466`		`- *np;`
	`465`	`+ const char *p;`
	`466`	`+ char *np;`
`467`	`467`
`468`	`468`	`for (p = key, np = newkey; *p != '\0'; p++)`
`469`	`469`	`{`
`@@ -508,7 +508,7 @@ pg_char_to_encname_struct(const char *name)`
`508`	`508`	`errmsg("encoding name too long")));`
`509`	`509`	`#endif`
`510`	`510`	`}`
`511`		`- key = clean_encoding_name((char *) name, buff);`
	`511`	`+ key = clean_encoding_name(name, buff);`
`512`	`512`
`513`	`513`	`while (last >= base)`
`514`	`514`	`{`