summaryrefslogtreecommitdiff
path: root/src/backend/tsearch
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/tsearch
parentd141e7493bb821300396d155fdea62a0278ddd6a (diff)
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/tsearch')
-rw-r--r--src/backend/tsearch/ts_locale.c6
1 files changed, 1 insertions, 5 deletions
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)
{
/*