luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Swap gcc warning by another in exfat_ucstoutf8()

Browse source
This commit is contained in:
Christophe Grenier 2014-11-15 12:09:08 +01:00
parent 4c29e6b6fe
commit 42428f901c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/exfat_dir.c
View file

@ -79,18 +79,18 @@ static inline void exfat16_towchar(wchar_t *dst, const uint8_t *src, size_t len)
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
static int exfat_ucstoutf8(iconv_t cd, const unsigned char *ins, const unsigned int ins_len, char **outs, const unsigned int outs_len) static int exfat_ucstoutf8(iconv_t cd, const unsigned char *ins, const unsigned int ins_len, char **outs, const unsigned int outs_len)
{ {
char *inp; const char *inp;
char *outp; char *outp;
size_t inb_left, outb_left; size_t inb_left, outb_left;
if (cd == (iconv_t)(-1)) if (cd == (iconv_t)(-1))
return -1; return -1;
outp = *outs; outp = *outs;
inp = ins; inp = (const char *)ins;
inb_left = ins_len; inb_left = ins_len;
outb_left = outs_len - 1; // reserve 1 byte for NUL outb_left = outs_len - 1; // reserve 1 byte for NUL
if (iconv(cd, &inp, &inb_left, &outp, &outb_left) == (size_t)(-1)) if (iconv(cd, (char **)&inp, &inb_left, &outp, &outb_left) == (size_t)(-1))
{ {
// Regardless of the value of errno // Regardless of the value of errno
log_error("exfat_ucstoutf8: iconv failed %s\n", strerror(errno)); log_error("exfat_ucstoutf8: iconv failed %s\n", strerror(errno));