diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-11-10 15:18:40 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-11-10 15:18:40 +0000 |
| commit | 2b74d45c1b7c8170b8a2abdd86dae8fd2bb239e7 (patch) | |
| tree | 22a6eddad024b50ed5c8bdcd852d77f935bbc7ed | |
| parent | d141e7493bb821300396d155fdea62a0278ddd6a (diff) | |
| download | postgresql-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.
| -rw-r--r-- | src/backend/snowball/dict_snowball.c | 8 | ||||
| -rw-r--r-- | src/backend/tsearch/ts_locale.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 4 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index 328ef5a0efe..38742346345 100644 --- 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 index 53349d7fc08..efd3023991b 100644 --- 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 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. |