borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings on calls to iconv, on freebsd.

This commit is contained in:
Guillaume Friloux 2014-05-30 09:31:11 +02:00
parent 3ab1b8afd8
commit 19e0422adf
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/eina/eina_str.c
View File

@ -467,7 +467,8 @@ EAPI char *
eina_str_convert(const char *enc_from, const char *enc_to, const char *text) eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
{ {
iconv_t ic; iconv_t ic;
char *new_txt, *inp, *outp; char *new_txt, *outp;
const char *inp;
size_t inb, outb, outlen, tob, outalloc; size_t inb, outb, outlen, tob, outalloc;
if (!text) if (!text)
@ -480,7 +481,7 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
new_txt = malloc(64); new_txt = malloc(64);
inb = strlen(text); inb = strlen(text);
outb = 64; outb = 64;
inp = (char *)text; inp = text;
outp = new_txt; outp = new_txt;
outalloc = 64; outalloc = 64;
outlen = 0; outlen = 0;
@ -490,7 +491,11 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
size_t count; size_t count;
tob = outb; tob = outb;
#ifdef __FreeBSD__
count = iconv(ic, &inp, &inb, &outp, &outb); count = iconv(ic, &inp, &inb, &outp, &outb);
#else
count = iconv(ic, (char **)&inp, &inb, &outp, &outb);
#endif
outlen += tob - outb; outlen += tob - outb;
if (count == (size_t)(-1)) if (count == (size_t)(-1))
{ {
@ -538,7 +543,8 @@ EAPI char *
eina_str_convert_len(const char *enc_from, const char *enc_to, const char *text, size_t len, size_t *retlen) eina_str_convert_len(const char *enc_from, const char *enc_to, const char *text, size_t len, size_t *retlen)
{ {
iconv_t ic; iconv_t ic;
char *new_txt, *inp, *outp; char *new_txt, *outp;
const char *inp;
size_t inb, outb, outlen, tob, outalloc; size_t inb, outb, outlen, tob, outalloc;
if (retlen) *retlen = 0; if (retlen) *retlen = 0;
@ -551,7 +557,7 @@ eina_str_convert_len(const char *enc_from, const char *enc_to, const char *text,
new_txt = malloc(64); new_txt = malloc(64);
inb = len; inb = len;
outb = 64; outb = 64;
inp = (char *)text; inp = text;
outp = new_txt; outp = new_txt;
outalloc = 64; outalloc = 64;
outlen = 0; outlen = 0;
@ -561,7 +567,11 @@ eina_str_convert_len(const char *enc_from, const char *enc_to, const char *text,
size_t count; size_t count;
tob = outb; tob = outb;
#ifdef __FreeBSD__
count = iconv(ic, &inp, &inb, &outp, &outb); count = iconv(ic, &inp, &inb, &outp, &outb);
#else
count = iconv(ic, (char **)&inp, &inb, &outp, &outb);
#endif
outlen += tob - outb; outlen += tob - outb;
if (count == (size_t)(-1)) if (count == (size_t)(-1))
{ {