Skip to content
Snippets Groups Projects
Commit e0aac8d0 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Resolve MSVC warnings about possible data loss and signed/unsigned compares

parent 70441b12
No related branches found
No related tags found
No related merge requests found
...@@ -853,10 +853,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -853,10 +853,10 @@ char* xp_asprintf_next(char *format, int type, ...)
i=ul; i=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
i=ll; i=(int)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
i=ull; i=(int)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if(cp) if(cp)
...@@ -893,10 +893,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -893,10 +893,10 @@ char* xp_asprintf_next(char *format, int type, ...)
i=ul; i=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
i=ll; i=(int)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
i=ull; i=(int)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
...@@ -931,10 +931,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -931,10 +931,10 @@ char* xp_asprintf_next(char *format, int type, ...)
ui=ul; ui=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
ui=ll; ui=(unsigned int)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
ui=ull; ui=(unsigned int)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
...@@ -969,10 +969,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -969,10 +969,10 @@ char* xp_asprintf_next(char *format, int type, ...)
l=ul; l=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
l=ll; l=(long)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
l=ull; l=(long)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
...@@ -1007,10 +1007,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -1007,10 +1007,10 @@ char* xp_asprintf_next(char *format, int type, ...)
ul=l; ul=l;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
ul=ll; ul=(unsigned long)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
ul=ull; ul=(unsigned long)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
...@@ -1057,10 +1057,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -1057,10 +1057,10 @@ char* xp_asprintf_next(char *format, int type, ...)
ll = 0; ll = 0;
break; break;
case XP_PRINTF_TYPE_DOUBLE: case XP_PRINTF_TYPE_DOUBLE:
ll=d; ll=(long long)d;
break; break;
case XP_PRINTF_TYPE_LONGDOUBLE: case XP_PRINTF_TYPE_LONGDOUBLE:
ll=ld; ll=(long long)ld;
break; break;
case XP_PRINTF_TYPE_VOIDP: case XP_PRINTF_TYPE_VOIDP:
ll=(long long)((intptr_t)pntr); ll=(long long)((intptr_t)pntr);
...@@ -1095,10 +1095,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -1095,10 +1095,10 @@ char* xp_asprintf_next(char *format, int type, ...)
ull = 0; ull = 0;
break; break;
case XP_PRINTF_TYPE_DOUBLE: case XP_PRINTF_TYPE_DOUBLE:
ull=d; ull=(unsigned long long)d;
break; break;
case XP_PRINTF_TYPE_LONGDOUBLE: case XP_PRINTF_TYPE_LONGDOUBLE:
ull=ld; ull=(unsigned long long)ld;
break; break;
case XP_PRINTF_TYPE_VOIDP: case XP_PRINTF_TYPE_VOIDP:
ull=(unsigned long long int)((uintptr_t)pntr); ull=(unsigned long long int)((uintptr_t)pntr);
...@@ -1173,10 +1173,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -1173,10 +1173,10 @@ char* xp_asprintf_next(char *format, int type, ...)
d=ul; d=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
d=ll; d=(double)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
d=ull; d=(double)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
...@@ -1211,10 +1211,10 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -1211,10 +1211,10 @@ char* xp_asprintf_next(char *format, int type, ...)
ld=ul; ld=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
ld=ll; ld=(long double)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
ld=ull; ld=(long double)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
...@@ -1285,14 +1285,14 @@ char* xp_asprintf_next(char *format, int type, ...) ...@@ -1285,14 +1285,14 @@ char* xp_asprintf_next(char *format, int type, ...)
s=ul; s=ul;
break; break;
case XP_PRINTF_TYPE_LONGLONG: case XP_PRINTF_TYPE_LONGLONG:
s=ll; s=(size_t)ll;
break; break;
case XP_PRINTF_TYPE_ULONGLONG: case XP_PRINTF_TYPE_ULONGLONG:
s=ull; s=(size_t)ull;
break; break;
case XP_PRINTF_TYPE_CHARP: case XP_PRINTF_TYPE_CHARP:
if (cp) if (cp)
s=strtoull(cp, NULL, 0); s=(size_t)strtoull(cp, NULL, 0);
else else
s = 0; s = 0;
break; break;
...@@ -1476,7 +1476,7 @@ build_arg_table(const char *format, va_list va) ...@@ -1476,7 +1476,7 @@ build_arg_table(const char *format, va_list va)
next=xp_asprintf_start(format); next=xp_asprintf_start(format);
if(next==NULL) if(next==NULL)
return(NULL); return(NULL);
int curpos = 0; unsigned curpos = 0;
while(*(size_t *)next) { while(*(size_t *)next) {
int newpos = xp_printf_get_next(next); int newpos = xp_printf_get_next(next);
if (newpos == -1) { if (newpos == -1) {
...@@ -1529,7 +1529,7 @@ build_arg_table(const char *format, va_list va) ...@@ -1529,7 +1529,7 @@ build_arg_table(const char *format, va_list va)
// And finally, get all the values... // And finally, get all the values...
va_copy(wva, va); va_copy(wva, va);
for (int i = 0; i < maxarg; i++) { for (unsigned i = 0; i < maxarg; i++) {
switch(ret[i].type) { switch(ret[i].type) {
case XP_PRINTF_TYPE_CHAR: case XP_PRINTF_TYPE_CHAR:
case XP_PRINTF_TYPE_INT: case XP_PRINTF_TYPE_INT:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment