diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-25 20:18:01 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-25 20:18:01 +0000 |
| commit | 689eb53e478debe0232e4fb928a0d6aae33fa34c (patch) | |
| tree | 5113d4f2b03c9ec6d756bf53117dbb189a735b68 /src/backend/utils/mb/conv.c | |
| parent | 9fecf302f79a49f132e8a61b8f073959fa1ed1fd (diff) | |
| download | postgresql-689eb53e478debe0232e4fb928a0d6aae33fa34c.tar.gz postgresql-689eb53e478debe0232e4fb928a0d6aae33fa34c.zip | |
Error message editing in backend/utils (except /adt).
Diffstat (limited to 'src/backend/utils/mb/conv.c')
| -rw-r--r-- | src/backend/utils/mb/conv.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index 2586365f3bc..ec1af6a4e72 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.45 2003/04/12 07:53:57 ishii Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mb/conv.c,v 1.46 2003/07/25 20:17:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -371,7 +371,10 @@ UtfToLocal(unsigned char *utf, unsigned char *iso, sizeof(pg_utf_to_local), compare1); if (p == NULL) { - elog(WARNING, "UtfToLocal: could not convert UTF-8 (0x%04x). Ignored", iutf); + ereport(WARNING, + (errcode(ERRCODE_UNTRANSLATABLE_CHARACTER), + errmsg("ignoring unconvertible UTF-8 character 0x%04x", + iutf))); continue; } if (p->code & 0xff000000) @@ -398,7 +401,9 @@ LocalToUtf(unsigned char *iso, unsigned char *utf, pg_local_to_utf *p; if (!PG_VALID_ENCODING(encoding)) - elog(ERROR, "Invalid encoding number %d", encoding); + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("invalid encoding number: %d", encoding))); for (; len > 0 && *iso; len -= l) { @@ -435,8 +440,10 @@ LocalToUtf(unsigned char *iso, unsigned char *utf, sizeof(pg_local_to_utf), compare2); if (p == NULL) { - elog(WARNING, "LocalToUtf: could not convert (0x%04x) %s to UTF-8. Ignored", - iiso, (&pg_enc2name_tbl[encoding])->name); + ereport(WARNING, + (errcode(ERRCODE_UNTRANSLATABLE_CHARACTER), + errmsg("ignoring unconvertible %s character 0x%04x", + (&pg_enc2name_tbl[encoding])->name, iiso))); continue; } if (p->utf & 0xff000000) |