database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

pg_char_to_encoding() was redundant in initdb because

Browse Source 
pg_valid_server_encoding() returns the same result if the encoding is
valid.

ITAGAKI Takahiro
This commit is contained in:
Bruce Momjian
2007-03-29 22:46:42 +00:00
parent 31f0bacb44
commit 452427d0fd
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * 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 (encoding_name && *encoding_name)
{ {
if ((enc = pg_char_to_encoding(encoding_name)) >= 0 && if ((enc = pg_valid_server_encoding(encoding_name)) >= 0)
pg_valid_server_encoding(encoding_name) >= 0)
return encodingid_to_string(enc); return encodingid_to_string(enc);
} }
fprintf(stderr, _("%s: \"%s\" is not a valid server encoding name\n"), fprintf(stderr, _("%s: \"%s\" is not a valid server encoding name\n"),