summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2008-11-10 15:18:40 +0000
committerTom Lane2008-11-10 15:18:40 +0000
commit3956d053f7d92009a7186ac144762a5b2e7b8f6c (patch)
treee5e891bc4066eeb9ae6575c1d901eb4baa9a0838
parentac2cd02c2a235028615283beead9e39c8ee7d708 (diff)
pg_do_encoding_conversion cannot return NULL (at least not unless the input
is NULL), so remove some useless tests for the case.
-rw-r--r--src/backend/snowball/dict_snowball.c6
-rw-r--r--src/backend/tsearch/ts_locale.c4
-rw-r--r--src/backend/utils/mb/mbutils.c2
3 files changed, 0 insertions, 12 deletions
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
index 8a8d20aeec..438bc1c1a0 100644
--- a/src/backend/snowball/dict_snowball.c
+++ b/src/backend/snowball/dict_snowball.c
@@ -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
index 80e31d9511..c534ac1ff7 100644
--- a/src/backend/tsearch/ts_locale.c
+++ b/src/backend/tsearch/ts_locale.c
@@ -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
index 9b41fb94eb..e45218a15c 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -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.