Changeset 4ff0966 for util.c

Timestamp:

2006-05-28T23:13:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df417ca

Parents:

cdca30b (diff), 79b6213 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from main/jelmer.

File:

• util.c (modified) (4 diffs)

util.c

@@ -39 +39 @@
 #include <glib.h>
 #include <time.h>
-#ifdef GLIB2
-#define iconv_t GIConv
-#define iconv_open g_iconv_open
-#define iconv_close g_iconv_close
-#define iconv g_iconv
-#else
-#include <iconv.h>
-#endif
 
 void strip_linefeed(gchar *text)
@@ -465 +457 @@
 signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf )
 {
-        iconv_t cd;
+        GIConv cd;
         size_t res;
         size_t inbytesleft, outbytesleft;
@@ -471 +463 @@
         char *outbuf = dst;
         
-        cd = iconv_open( to_cs, from_cs );
-        if( cd == (iconv_t) -1 )
+        cd = g_iconv_open( to_cs, from_cs );
+        if( cd == (GIConv) -1 )
                 return( -1 );
         
         inbytesleft = size ? size : strlen( src );
         outbytesleft = maxbuf - 1;
-        res = iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
+        res = g_iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
         *outbuf = '\0';
-        iconv_close( cd );
+        g_iconv_close( cd );
         
         if( res == (size_t) -1 )
@@ -489 +481 @@
 char *set_eval_charset( irc_t *irc, set_t *set, char *value )
 {
-        iconv_t cd;
+        GIConv cd;
 
         if ( g_strncasecmp( value, "none", 4 ) == 0 )
                 return( value );
 
-        cd = iconv_open( "UTF-8", value );
-        if( cd == (iconv_t) -1 )
+        cd = g_iconv_open( "UTF-8", value );
+        if( cd == (GIConv) -1 )
                 return( NULL );
 
-        iconv_close( cd );
+        g_iconv_close( cd );
         return( value );
 }