From f674ea76d22ee2d084856c2fb3bec68ce8854cff Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Tue, 26 Feb 2008 14:50:00 +0000 Subject: 24592: make types of charset conversion failure more explicit --- ChangeLog | 5 +++++ Src/utils.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7448d726..bf26f2cb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-26 Peter Stephenson + + * 24592: Src/utils.c: make errors about charset conversion + more explicit. + 2008-02-23 Peter Stephenson * 24590: Src/exec.c, Src/lex.c: tame overzealous error diff --git a/Src/utils.c b/Src/utils.c index edf1ea288..b25ea8506 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4877,7 +4877,7 @@ getkeystring(char *s, int *len, int how, int *misc) cd = iconv_open(nl_langinfo(CODESET), "UCS-4BE"); if (cd == (iconv_t)-1) { - zerr("cannot do charset conversion"); + zerr("cannot do charset conversion (iconv failed)"); CHARSET_FAILED(); } count = iconv(cd, &inptr, &inbytes, &t, &outbytes); @@ -4889,12 +4889,12 @@ getkeystring(char *s, int *len, int how, int *misc) if ((how & GETKEY_UPDATE_OFFSET) && s - sstart < *misc) (*misc) += count; # else - zerr("cannot do charset conversion"); + zerr("cannot do charset conversion (iconv not available)"); CHARSET_FAILED(); # endif } # else - zerr("cannot do charset conversion"); + zerr("cannot do charset conversion (NLS not supported)"); CHARSET_FAILED(); # endif # endif -- cgit 1.4.1