Changeset f5da476

Timestamp:

2011-07-02T16:34:42Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a010498

Parents:

9e7a566

Message:

Fixed use of g_iconv() in do_iconv(). This was done wrong for ages and
apparently screwed up charset handling in OSCAR pretty badly.. Found and
fixed by dalias (#813). May or may not also fix other bugs.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -400 +400 @@
         cd = g_iconv_open( to_cs, from_cs );
         if( cd == (GIConv) -1 )
-                return( -1 );
+                return -1;
         
         inbytesleft = size ? size : strlen( src );
@@ -408 +408 @@
         g_iconv_close( cd );
         
-        if( res == (size_t) -1 )
-                return( -1 );
+        if( res != 0 )
+                return -1;
         else
-                return( outbuf - dst );
+                return outbuf - dst;
 }