diff options
| author | Simon Tatham <anakin@pobox.com> | 2004-06-27 13:18:32 +0000 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2004-06-27 13:18:32 +0000 |
| commit | d87fabeacea32abba73d67f991f9e523991369c7 (patch) | |
| tree | 2107cd344ecdf683140efcf9503a23677f55141c /bk_info.c | |
| parent | 037337dcc8cc4e7f2f8a628ab73b1b461dae7171 (diff) | |
| download | halibut-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 'bk_info.c')
| -rw-r--r-- | bk_info.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -134,9 +134,7 @@ static infoconfig info_configure(paragraph *source) { sfree(ret.filename); ret.filename = dupstr(adv(p->origkeyword)); } else if (!ustricmp(p->keyword, L"info-charset")) { - char *csname = utoa_dup(uadv(p->keyword), CS_ASCII); - ret.charset = charset_from_localenc(csname); - sfree(csname); + ret.charset = charset_from_ustr(&p->fpos, uadv(p->keyword)); } else if (!ustricmp(p->keyword, L"info-max-file-size")) { ret.maxfilesize = utoi(uadv(p->keyword)); } else if (!ustricmp(p->keyword, L"info-width")) { |