generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-24 14:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #150 from redboltz/fix_fprintf_macro

Browse Source 
Fixed https://github.com/msgpack/msgpack-c/issues/148
This commit is contained in:
Takatoshi Kondo 2014-10-31 10:17:24 +09:00
commit 561e9ba105
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/objectc.c
View File

@ -20,15 +20,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifndef _MSC_VER #if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <inttypes.h> #include <inttypes.h>
#else
#ifndef PRIu64
#define PRIu64 "I64u"
#endif
#ifndef PRIi64
#define PRIi64 "I64d"
#endif
#endif #endif
@ -125,11 +118,27 @@ void msgpack_object_print(FILE* out, msgpack_object o)
break; break;
case MSGPACK_OBJECT_POSITIVE_INTEGER: case MSGPACK_OBJECT_POSITIVE_INTEGER:
#if defined(PRIu64)
fprintf(out, "%" PRIu64, o.via.u64); fprintf(out, "%" PRIu64, o.via.u64);
#else
if (o.via.u64 > ULONG_MAX)
fprintf(out, "over 4294967295");
else
fprintf(out, "%lu", (unsigned long)o.via.u64);
#endif
break; break;
case MSGPACK_OBJECT_NEGATIVE_INTEGER: case MSGPACK_OBJECT_NEGATIVE_INTEGER:
#if defined(PRIi64)
fprintf(out, "%" PRIi64, o.via.i64); fprintf(out, "%" PRIi64, o.via.i64);
#else
if (o.via.i64 > LONG_MAX)
fprintf(out, "over +2147483647");
else if (o.via.i64 < LONG_MIN)
fprintf(out, "under -2147483648");
else
fprintf(out, "%ld", (signed long)o.via.i64);
#endif
break; break;
case MSGPACK_OBJECT_DOUBLE: case MSGPACK_OBJECT_DOUBLE:
@ -149,7 +158,11 @@ void msgpack_object_print(FILE* out, msgpack_object o)
break; break;
case MSGPACK_OBJECT_EXT: case MSGPACK_OBJECT_EXT:
#if defined(PRIi8)
fprintf(out, "(ext: %" PRIi8 ")", o.via.ext.type); fprintf(out, "(ext: %" PRIi8 ")", o.via.ext.type);
#else
fprintf(out, "(ext: %d)", (int)o.via.ext.type);
#endif
fprintf(out, "\""); fprintf(out, "\"");
fwrite(o.via.ext.ptr, o.via.ext.size, 1, out); fwrite(o.via.ext.ptr, o.via.ext.size, 1, out);
fprintf(out, "\""); fprintf(out, "\"");
@ -191,7 +204,15 @@ void msgpack_object_print(FILE* out, msgpack_object o)
default: default:
// FIXME // FIXME
#if defined(PRIu64)
fprintf(out, "#<UNKNOWN %i %" PRIu64 ">", o.type, o.via.u64); fprintf(out, "#<UNKNOWN %i %" PRIu64 ">", o.type, o.via.u64);
#else
if (o.via.u64 > ULONG_MAX)
fprintf(out, "#<UNKNOWN %i over 4294967295>", o.type);
else
fprintf(out, "#<UNKNOWN %i %lu>", o.type, (unsigned long)o.via.u64);
#endif
} }
} }
@ -270,4 +291,3 @@ bool msgpack_object_equal(const msgpack_object x, const msgpack_object y)
return false; return false;
} }
} }