mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-17 19:25:54 +02:00
Merge branch 'bin-printer' of https://github.com/iphydf/msgpack-c into iphydf-bin-printer
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "msgpack/object.h"
|
#include "msgpack/object.h"
|
||||||
#include "msgpack/pack.h"
|
#include "msgpack/pack.h"
|
||||||
|
#include <ctype.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@@ -112,6 +113,21 @@ int msgpack_pack_object(msgpack_packer* pk, msgpack_object d)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void msgpack_object_bin_print(FILE* out, const char *ptr, size_t size)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
for (i = 0; i < size; i++) {
|
||||||
|
if (ptr[i] == '"') {
|
||||||
|
fputs("\\\"", out);
|
||||||
|
} else if (isprint(ptr[i])) {
|
||||||
|
fputc(ptr[i], out);
|
||||||
|
} else {
|
||||||
|
fprintf(out, "\\x%02x", (unsigned char)ptr[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void msgpack_object_print(FILE* out, msgpack_object o)
|
void msgpack_object_print(FILE* out, msgpack_object o)
|
||||||
{
|
{
|
||||||
switch(o.type) {
|
switch(o.type) {
|
||||||
@@ -159,7 +175,7 @@ void msgpack_object_print(FILE* out, msgpack_object o)
|
|||||||
|
|
||||||
case MSGPACK_OBJECT_BIN:
|
case MSGPACK_OBJECT_BIN:
|
||||||
fprintf(out, "\"");
|
fprintf(out, "\"");
|
||||||
fwrite(o.via.bin.ptr, o.via.bin.size, 1, out);
|
msgpack_object_bin_print(out, o.via.bin.ptr, o.via.bin.size);
|
||||||
fprintf(out, "\"");
|
fprintf(out, "\"");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -170,7 +186,7 @@ void msgpack_object_print(FILE* out, msgpack_object o)
|
|||||||
fprintf(out, "(ext: %d)", (int)o.via.ext.type);
|
fprintf(out, "(ext: %d)", (int)o.via.ext.type);
|
||||||
#endif
|
#endif
|
||||||
fprintf(out, "\"");
|
fprintf(out, "\"");
|
||||||
fwrite(o.via.ext.ptr, o.via.ext.size, 1, out);
|
msgpack_object_bin_print(out, o.via.ext.ptr, o.via.ext.size);
|
||||||
fprintf(out, "\"");
|
fprintf(out, "\"");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user