Commit2b74d45

committed

pg_do_encoding_conversion cannot return NULL (at least not unless the input

is NULL), so remove some useless tests for the case.

1 parentd141e74 commit2b74d45Copy full SHA for 2b74d45

File tree

-15

lines changed

-15

lines changed

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.6 2008/01/01 19:45:51 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.7 2008/11/10 15:18:40 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -262,9 +262,6 @@ dsnowball_lexize(PG_FUNCTION_ARGS)`
`262`	`262`	`strlen(txt),`
`263`	`263`	`GetDatabaseEncoding(),`
`264`	`264`	`PG_UTF8);`
`265`		`-if (recoded==NULL)`
`266`		`-elog(ERROR,"encoding conversion failed");`
`267`		`-`
`268`	`265`	`if (recoded!=txt)`
`269`	`266`	`{`
`270`	`267`	`pfree(txt);`
`@@ -294,9 +291,6 @@ dsnowball_lexize(PG_FUNCTION_ARGS)`
`294`	`291`	`strlen(txt),`
`295`	`292`	`PG_UTF8,`
`296`	`293`	`GetDatabaseEncoding());`
`297`		`-if (recoded==NULL)`
`298`		`-elog(ERROR,"encoding conversion failed");`
`299`		`-`
`300`	`294`	`if (recoded!=txt)`
`301`	`295`	`{`
`302`	`296`	`pfree(txt);`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.10 2008/06/18 20:55:42 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.11 2008/11/10 15:18:40 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -204,10 +204,6 @@ t_readline(FILE *fp)`
`204`	`204`	`len,`
`205`	`205`	`PG_UTF8,`
`206`	`206`	`GetDatabaseEncoding());`
`207`		`-`
`208`		`-if (recoded==NULL)/* should not happen */`
`209`		`-elog(ERROR,"encoding conversion failed");`
`210`		`-`
`211`	`207`	`if (recoded==buf)`
`212`	`208`	`{`
`213`	`209`	`/*`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* (currently mule internal code (mic) is used)`
`5`	`5`	`* Tatsuo Ishii`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.73 2008/06/18 23:08:47 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.74 2008/11/10 15:18:40 tgl Exp $`
`8`	`8`	`*/`
`9`	`9`	`#include"postgres.h"`
`10`	`10`
`@@ -381,8 +381,6 @@ pg_convert(PG_FUNCTION_ARGS)`
`381`	`381`	`*(str+len)='\0';`
`382`	`382`
`383`	`383`	`result=pg_do_encoding_conversion(str,len,src_encoding,dest_encoding);`
`384`		`-if (result==NULL)`
`385`		`-elog(ERROR,"encoding conversion failed");`
`386`	`384`
`387`	`385`	`/*`
`388`	`386`	`* build bytea data type structure.`

Comments

(0)