From d36758ad9768e5f746b82f7f88ea86361365de52 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 26 Jun 2010 16:26:05 +0000 Subject: Fix some types If "easy" charset conversion fails, return a copy of the original string. svn path=/trunk/netsurf/; revision=10580 --- amiga/utf8.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'amiga/utf8.c') diff --git a/amiga/utf8.c b/amiga/utf8.c index bb94c6390..5609be348 100755 --- a/amiga/utf8.c +++ b/amiga/utf8.c @@ -25,12 +25,12 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, char **result) { - ULONG *charset; + LONG charset; char *encname; charset = GetDiskFontCtrl(DFCTRL_CHARSET); encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME); - + return utf8_to_enc(string,encname,len,result); } @@ -49,7 +49,7 @@ char *ami_utf8_easy(char *string) } else { - return NULL; + return strdup(string); } } @@ -63,14 +63,14 @@ char *ami_to_utf8_easy(char *string) } else { - return NULL; + return strdup(string); } } utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len, char **result) { - ULONG *charset; + LONG charset; char *encname; charset = GetDiskFontCtrl(DFCTRL_CHARSET); -- cgit v1.2.3