From 875f1327a47f78d783c3abc7f7acc3977dc286ec Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 13 Mar 2014 11:07:52 -0400 Subject: [PATCH] Use fixed-width format specifiers in serializeStructToString --- src/util/serialize.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp index 58f569fb7..170daa0f8 100644 --- a/src/util/serialize.cpp +++ b/src/util/serialize.cpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "../exceptions.h" #include "../irrlichttypes.h" +#include // For PRIxN, cinttypes is C++11-only #include #include #include @@ -416,19 +417,19 @@ bool serializeStructToString(std::string *outstr, if (width == 16) { bufpos += PADDING(bufpos, u16); nprinted = snprintf(sbuf + pos, sbuflen, - is_unsigned ? "%u, " : "%d, ", + is_unsigned ? "%" PRIu16 ", " : "%" PRIi16 ", ", *((u16 *)bufpos)); bufpos += sizeof(u16); } else if (width == 32) { bufpos += PADDING(bufpos, u32); nprinted = snprintf(sbuf + pos, sbuflen, - is_unsigned ? "%u, " : "%d, ", + is_unsigned ? "%" PRIu32 ", " : "%" PRIi32 ", ", *((u32 *)bufpos)); bufpos += sizeof(u32); } else if (width == 64) { bufpos += PADDING(bufpos, u64); nprinted = snprintf(sbuf + pos, sbuflen, - is_unsigned ? "%llu, " : "%lli, ", + is_unsigned ? "%" PRIu64 ", " : "%" PRIi64 ", ", *((u64 *)bufpos)); bufpos += sizeof(u64); }