Wuzzy
/
BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use fixed-width format specifiers in serializeStructToString" 

This reverts commit 875f1327a4.
Fixed width format specifiers are only officially availale in C99 and C++11.
master
ShadowNinja 2014-03-14 11:20:52 -04:00
parent 875f1327a4
commit d753d352f1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/serialize.cpp
View File

@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "../exceptions.h" #include "../exceptions.h"
#include "../irrlichttypes.h" #include "../irrlichttypes.h"
#include <inttypes.h> // For PRIxN, cinttypes is C++11-only
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include <vector> #include <vector>
@ -417,20 +416,20 @@ bool serializeStructToString(std::string *outstr,
if (width == 16) { if (width == 16) {
bufpos += PADDING(bufpos, u16); bufpos += PADDING(bufpos, u16);
nprinted = snprintf(sbuf + pos, sbuflen, nprinted = snprintf(sbuf + pos, sbuflen,
is_unsigned ? "%" PRIu16 ", " : "%" PRIi16 ", ", is_unsigned ? "%u, " : "%d, ",
*((u16 *)bufpos)); *((u16 *)bufpos));
bufpos += sizeof(u16); bufpos += sizeof(u16);
} else if (width == 32) { } else if (width == 32) {
bufpos += PADDING(bufpos, u32); bufpos += PADDING(bufpos, u32);
nprinted = snprintf(sbuf + pos, sbuflen, nprinted = snprintf(sbuf + pos, sbuflen,
is_unsigned ? "%" PRIu32 ", " : "%" PRIi32 ", ", is_unsigned ? "%u, " : "%d, ",
*((u32 *)bufpos)); *((u32 *)bufpos));
bufpos += sizeof(u32); bufpos += sizeof(u32);
} else if (width == 64) { } else if (width == 64) {
bufpos += PADDING(bufpos, u64); bufpos += PADDING(bufpos, u64);
nprinted = snprintf(sbuf + pos, sbuflen, nprinted = snprintf(sbuf + pos, sbuflen,
is_unsigned ? "%" PRIu64 ", " : "%" PRIi64 ", ", is_unsigned ? "%llu, " : "%lli, ",
*((u64 *)bufpos)); (unsigned long long)*((u64 *)bufpos));
bufpos += sizeof(u64); bufpos += sizeof(u64);
} }
break; break;