Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
lang.c
Log Message:
Fix warnings.
===================================================================
RCS file: /cvs/e/e16/e/src/lang.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- lang.c 12 Nov 2006 00:39:19 -0000 1.13
+++ lang.c 19 Nov 2006 12:34:18 -0000 1.14
@@ -195,11 +195,12 @@
EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
{
#if HAVE_ICONV
+ char *pi, *po;
size_t ni, no, rc;
if (!wcs)
{
- char buf[4096], *po;
+ char buf[4096];
ni = len;
no = 4096;
@@ -211,9 +212,11 @@
return wcl;
}
+ pi = (char *)str;
ni = len;
+ po = (char *)wcs;
no = wcl * sizeof(wchar_t);
- rc = iconv(iconv_cd_str2wcs, (char **)(&str), &ni, (char **)(&wcs), &no);
+ rc = iconv(iconv_cd_str2wcs, &pi, &ni, &po, &no);
if (rc == (size_t) (-1))
return 0;
return wcl - no / sizeof(wchar_t);
@@ -233,11 +236,13 @@
EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
{
#if HAVE_ICONV
+ char *pi;
size_t ni, no, rc;
+ pi = (char *)wcs;
ni = wcl * sizeof(wchar_t);
no = len;
- rc = iconv(iconv_cd_wcs2str, (char **)(&wcs), &ni, &str, &no);
+ rc = iconv(iconv_cd_wcs2str, &pi, &ni, &str, &no);
if (rc == (size_t) (-1))
return 0;
return len - no;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
