summaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2004-06-27 13:18:32 +0000
committerSimon Tatham <anakin@pobox.com>2004-06-27 13:18:32 +0000
commitd87fabeacea32abba73d67f991f9e523991369c7 (patch)
tree2107cd344ecdf683140efcf9503a23677f55141c /input.c
parent037337dcc8cc4e7f2f8a628ab73b1b461dae7171 (diff)
downloadhalibut-d87fabeacea32abba73d67f991f9e523991369c7.zip
halibut-d87fabeacea32abba73d67f991f9e523991369c7.tar.gz
halibut-d87fabeacea32abba73d67f991f9e523991369c7.tar.bz2
halibut-d87fabeacea32abba73d67f991f9e523991369c7.tar.xz
Sort out error handling everywhere a charset name is converted into
an integer charset ID. [originally from svn r4317]
Diffstat (limited to 'input.c')
-rw-r--r--input.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/input.c b/input.c
index 4eb1d8c..b31d583 100644
--- a/input.c
+++ b/input.c
@@ -86,9 +86,7 @@ static void input_configure(input *in, paragraph *cfg) {
assert(cfg->type == para_Config);
if (!ustricmp(cfg->keyword, L"input-charset")) {
- char *csname = utoa_dup(uadv(cfg->keyword), CS_ASCII);
- in->charset = charset_from_localenc(csname);
- sfree(csname);
+ in->charset = charset_from_ustr(&cfg->fpos, uadv(cfg->keyword));
}
}