rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6037 Use of non-memsize type for pointer arithmetic

This commit is contained in:
Andrew Nelless 2017-05-12 20:40:07 +01:00
parent 762718d938
commit 40e943d145
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/arch/IArchString.cpp
View File

@ -42,7 +42,7 @@ int
IArchString::convStringWCToMB(char* dst, IArchString::convStringWCToMB(char* dst,
const wchar_t* src, UInt32 n, bool* errors) const wchar_t* src, UInt32 n, bool* errors)
{ {
int len = 0; ptrdiff_t len = 0;
bool dummyErrors; bool dummyErrors;
if (errors == NULL) { if (errors == NULL) {
@ -58,14 +58,14 @@ IArchString::convStringWCToMB(char* dst,
if (dst == NULL) { if (dst == NULL) {
char dummy[MB_LEN_MAX]; char dummy[MB_LEN_MAX];
for (const wchar_t* scan = src; n > 0; ++scan, --n) { for (const wchar_t* scan = src; n > 0; ++scan, --n) {
int mblen = wctomb(dummy, *scan); ptrdiff_t mblen = wctomb(dummy, *scan);
if (mblen == -1) { if (mblen == -1) {
*errors = true; *errors = true;
mblen = 1; mblen = 1;
} }
len += mblen; len += mblen;
} }
int mblen = wctomb(dummy, L'\0'); ptrdiff_t mblen = wctomb(dummy, L'\0');
if (mblen != -1) { if (mblen != -1) {
len += mblen - 1; len += mblen - 1;
} }
@ -73,7 +73,7 @@ IArchString::convStringWCToMB(char* dst,
else { else {
char* dst0 = dst; char* dst0 = dst;
for (const wchar_t* scan = src; n > 0; ++scan, --n) { for (const wchar_t* scan = src; n > 0; ++scan, --n) {
int mblen = wctomb(dst, *scan); ptrdiff_t mblen = wctomb(dst, *scan);
if (mblen == -1) { if (mblen == -1) {
*errors = true; *errors = true;
*dst++ = '?'; *dst++ = '?';
@ -82,12 +82,12 @@ IArchString::convStringWCToMB(char* dst,
dst += mblen; dst += mblen;
} }
} }
int mblen = wctomb(dst, L'\0'); ptrdiff_t mblen = wctomb(dst, L'\0');
if (mblen != -1) { if (mblen != -1) {
// don't include nul terminator // don't include nul terminator
dst += mblen - 1; dst += mblen - 1;
} }
len = (int)(dst - dst0); len = dst - dst0;
} }
ARCH->unlockMutex(s_mutex); ARCH->unlockMutex(s_mutex);
@ -98,7 +98,7 @@ int
IArchString::convStringMBToWC(wchar_t* dst, IArchString::convStringMBToWC(wchar_t* dst,
const char* src, UInt32 n, bool* errors) const char* src, UInt32 n, bool* errors)
{ {
int len = 0; ptrdiff_t len = 0;
wchar_t dummy; wchar_t dummy;
bool dummyErrors; bool dummyErrors;
@ -114,7 +114,7 @@ IArchString::convStringMBToWC(wchar_t* dst,
if (dst == NULL) { if (dst == NULL) {
for (const char* scan = src; n > 0; ) { for (const char* scan = src; n > 0; ) {
int mblen = mbtowc(&dummy, scan, n); ptrdiff_t mblen = mbtowc(&dummy, scan, n);
switch (mblen) { switch (mblen) {
case -2: case -2:
// incomplete last character. convert to unknown character. // incomplete last character. convert to unknown character.
@ -150,7 +150,7 @@ IArchString::convStringMBToWC(wchar_t* dst,
else { else {
wchar_t* dst0 = dst; wchar_t* dst0 = dst;
for (const char* scan = src; n > 0; ++dst) { for (const char* scan = src; n > 0; ++dst) {
int mblen = mbtowc(dst, scan, n); ptrdiff_t mblen = mbtowc(dst, scan, n);
switch (mblen) { switch (mblen) {
case -2: case -2:
// incomplete character. convert to unknown character. // incomplete character. convert to unknown character.
@ -181,7 +181,7 @@ IArchString::convStringMBToWC(wchar_t* dst,
break; break;
} }
} }
len = (int)(dst - dst0); len = dst - dst0;
} }
ARCH->unlockMutex(s_mutex); ARCH->unlockMutex(s_mutex);