From d87fabeacea32abba73d67f991f9e523991369c7 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 27 Jun 2004 13:18:32 +0000 Subject: Sort out error handling everywhere a charset name is converted into an integer charset ID. [originally from svn r4317] --- bk_html.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'bk_html.c') diff --git a/bk_html.c b/bk_html.c index 86abd62..7ae80b5 100644 --- a/bk_html.c +++ b/bk_html.c @@ -267,13 +267,9 @@ static htmlconfig html_configure(paragraph *source) { k++; /* treat `xhtml-' and `html-' the same */ if (!ustricmp(k, L"html-restrict-charset")) { - char *csname = utoa_dup(uadv(k), CS_ASCII); - ret.restrict_charset = charset_from_localenc(csname); - sfree(csname); + ret.restrict_charset = charset_from_ustr(&p->fpos, uadv(k)); } else if (!ustricmp(k, L"html-output-charset")) { - char *csname = utoa_dup(uadv(k), CS_ASCII); - ret.output_charset = charset_from_localenc(csname); - sfree(csname); + ret.output_charset = charset_from_ustr(&p->fpos, uadv(k)); } else if (!ustricmp(k, L"html-version")) { wchar_t *vername = uadv(k); static const struct { -- cgit v1.1