Changes in util.c [574af7e:0a69d7b]
Legend:
- Unmodified
- Added
- Removed
-
util.c
r574af7e r0a69d7b 39 39 #include <glib.h> 40 40 #include <time.h> 41 #ifdef GLIB2 42 #define iconv_t GIConv 43 #define iconv_open g_iconv_open 44 #define iconv_close g_iconv_close 45 #define iconv g_iconv 46 #else 47 #include <iconv.h> 48 #endif 41 49 42 50 void strip_linefeed(gchar *text) … … 457 465 signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf ) 458 466 { 459 GIConvcd;467 iconv_t cd; 460 468 size_t res; 461 469 size_t inbytesleft, outbytesleft; … … 463 471 char *outbuf = dst; 464 472 465 cd = g_iconv_open( to_cs, from_cs );466 if( cd == ( GIConv) -1 )473 cd = iconv_open( to_cs, from_cs ); 474 if( cd == (iconv_t) -1 ) 467 475 return( -1 ); 468 476 469 477 inbytesleft = size ? size : strlen( src ); 470 478 outbytesleft = maxbuf - 1; 471 res = g_iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );479 res = iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft ); 472 480 *outbuf = '\0'; 473 g_iconv_close( cd );481 iconv_close( cd ); 474 482 475 483 if( res == (size_t) -1 ) … … 481 489 char *set_eval_charset( irc_t *irc, set_t *set, char *value ) 482 490 { 483 GIConvcd;491 iconv_t cd; 484 492 485 493 if ( g_strncasecmp( value, "none", 4 ) == 0 ) 486 494 return( value ); 487 495 488 cd = g_iconv_open( "UTF-8", value );489 if( cd == ( GIConv) -1 )496 cd = iconv_open( "UTF-8", value ); 497 if( cd == (iconv_t) -1 ) 490 498 return( NULL ); 491 499 492 g_iconv_close( cd );500 iconv_close( cd ); 493 501 return( value ); 494 502 }
Note: See TracChangeset
for help on using the changeset viewer.