Commit452427d

committed

pg_char_to_encoding() was redundant in initdb because

pg_valid_server_encoding() returns the same result if the encoding isvalid.ITAGAKI Takahiro

1 parent31f0bac commit452427dCopy full SHA for 452427d

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

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`	`returnencodingid_to_string(enc);`
`715`	`714`	`}`
`716`	`715`	`fprintf(stderr,_("%s: \"%s\" is not a valid server encoding name\n"),`

Comments

(0)