Fix compilation warning [-Wsign-compare].
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10704 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
6fee0c5765
commit
1bfb17fb55
@ -806,14 +806,14 @@ unsigned fl_utf8to_mb(const char* src, unsigned srclen,
|
||||
wchar_t lbuf[1024];
|
||||
wchar_t* buf = lbuf;
|
||||
unsigned length = fl_utf8towc(src, srclen, buf, 1024);
|
||||
int ret;
|
||||
int ret; // note: wcstombs() returns unsigned(length) or unsigned(-1)
|
||||
if (length >= 1024) {
|
||||
buf = (wchar_t*)(malloc((length+1)*sizeof(wchar_t)));
|
||||
fl_utf8towc(src, srclen, buf, length+1);
|
||||
}
|
||||
if (dstlen) {
|
||||
ret = wcstombs(dst, buf, dstlen);
|
||||
if (ret >= dstlen-1) ret = wcstombs(0,buf,0);
|
||||
if (ret >= (int)dstlen-1) ret = wcstombs(0,buf,0);
|
||||
} else {
|
||||
ret = wcstombs(0,buf,0);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user