pg_char_to_encoding() was redundant in initdb because

bmomjian · bmomjian · commit 452427d0fdc4 · 2007-03-29T22:46:42.000Z
pg_valid_server_encoding() returns the same result if the encoding is
valid.

ITAGAKI Takahiro
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.135 2007/03/18 16:50:43 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.136 2007/03/29 22:46:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -709,8 +709,7 @@ get_encoding_id(char *encoding_name)
 
 	if (encoding_name && *encoding_name)
 	{
-		if ((enc = pg_char_to_encoding(encoding_name)) >= 0 &&
-			pg_valid_server_encoding(encoding_name) >= 0)
+		if ((enc = pg_valid_server_encoding(encoding_name)) >= 0)
 			return encodingid_to_string(enc);
 	}
 	fprintf(stderr, _("%s: \"%s\" is not a valid server encoding name\n"),

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.135 2007/03/18 16:50:43 neilc Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.136 2007/03/29 22:46:42 momjian Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -709,8 +709,7 @@ get_encoding_id(char *encoding_name)`
`709`	`709`
`710`	`710`	`if (encoding_name && *encoding_name)`
`711`	`711`	`{`
`712`		`- if ((enc = pg_char_to_encoding(encoding_name)) >= 0 &&`
`713`		`- pg_valid_server_encoding(encoding_name) >= 0)`
	`712`	`+ if ((enc = pg_valid_server_encoding(encoding_name)) >= 0)`
`714`	`713`	`return encodingid_to_string(enc);`
`715`	`714`	`}`
`716`	`715`	`fprintf(stderr, _("%s: \"%s\" is not a valid server encoding name\n"),`