pg_do_encoding_conversion cannot return NULL (at least not unless the input

tglsfdc · tglsfdc · commit 2b74d45c1b7c · 2008-11-10T15:18:40.000Z
is NULL), so remove some useless tests for the case.
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.6 2008/01/01 19:45:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.7 2008/11/10 15:18:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -262,9 +262,6 @@ dsnowball_lexize(PG_FUNCTION_ARGS)
 														 strlen(txt),
 													   GetDatabaseEncoding(),
 														 PG_UTF8);
-			if (recoded == NULL)
-				elog(ERROR, "encoding conversion failed");
-
 			if (recoded != txt)
 			{
 				pfree(txt);
@@ -294,9 +291,6 @@ dsnowball_lexize(PG_FUNCTION_ARGS)
 														 strlen(txt),
 														 PG_UTF8,
 													  GetDatabaseEncoding());
-			if (recoded == NULL)
-				elog(ERROR, "encoding conversion failed");
-
 			if (recoded != txt)
 			{
 				pfree(txt);
diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.10 2008/06/18 20:55:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.11 2008/11/10 15:18:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -204,10 +204,6 @@ t_readline(FILE *fp)
 												 len,
 												 PG_UTF8,
 												 GetDatabaseEncoding());
-
-	if (recoded == NULL)		/* should not happen */
-		elog(ERROR, "encoding conversion failed");
-
 	if (recoded == buf)
 	{
 		/*
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.73 2008/06/18 23:08:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.74 2008/11/10 15:18:40 tgl Exp $
  */
 #include "postgres.h"
 
@@ -381,8 +381,6 @@ pg_convert(PG_FUNCTION_ARGS)
 	*(str + len) = '\0';
 
 	result = pg_do_encoding_conversion(str, len, src_encoding, dest_encoding);
-	if (result == NULL)
-		elog(ERROR, "encoding conversion failed");
 
 	/*
 	 * build bytea data type structure.

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`	`/*`