Sort out error handling everywhere a charset name is converted into

an integer charset ID.

[originally from svn r4317]

1 files changed, 8 insertions, 0 deletions

diff --git a/error.c b/error.c
index 0330e76..7b9ceaa 100644
--- a/error.c
+++ b/error.c
@@ -257,6 +257,14 @@ static void do_error(int code, va_list ap) {
 	sfree(sp);
 	flags = FILEPOS;
 	break;
+      case err_charset:
+	fpos = *va_arg(ap, filepos *);
+	wsp = va_arg(ap, wchar_t *);
+	sp = utoa_locale_dup(wsp);
+	sprintf(error, "character set `%.200s' not recognised", sp);
+	flags = FILEPOS;
+	sfree(sp);
+	break;
       case err_whatever:
 	sp = va_arg(ap, char *);
         vsprintf(error, sp, ap);