aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/mb/mbutils.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2008-11-10 15:18:40 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2008-11-10 15:18:40 +0000
commit2b74d45c1b7c8170b8a2abdd86dae8fd2bb239e7 (patch)
tree22a6eddad024b50ed5c8bdcd852d77f935bbc7ed /src/backend/utils/mb/mbutils.c
parentd141e7493bb821300396d155fdea62a0278ddd6a (diff)
downloadpostgresql-2b74d45c1b7c8170b8a2abdd86dae8fd2bb239e7.tar.gz
postgresql-2b74d45c1b7c8170b8a2abdd86dae8fd2bb239e7.zip
pg_do_encoding_conversion cannot return NULL (at least not unless the input
is NULL), so remove some useless tests for the case.
Diffstat (limited to 'src/backend/utils/mb/mbutils.c')
-rw-r--r--src/backend/utils/mb/mbutils.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index bbd716a9c0e..678989a0c0f 100644
--- 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.