projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify style
[jansson.git]
/
src
/
dump.c
diff --git
a/src/dump.c
b/src/dump.c
index
dc27fbd
..
0ffdfc6
100644
(file)
--- a/
src/dump.c
+++ b/
src/dump.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009
, 2010
Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009
-2011
Petri Lehtinen <petri@digip.org>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@
-41,10
+41,10
@@
static int dump_to_file(const char *buffer, int size, void *data)
return 0;
}
return 0;
}
-/*
256
spaces (the maximum indentation size) */
-static char whitespace[] = "
";
+/*
32
spaces (the maximum indentation size) */
+static char whitespace[] = " ";
-static int dump_indent(
unsigned long
flags, int depth, int space, dump_func dump, void *data)
+static int dump_indent(
size_t
flags, int depth, int space, dump_func dump, void *data)
{
if(JSON_INDENT(flags) > 0)
{
{
if(JSON_INDENT(flags) > 0)
{
@@
-165,7
+165,7
@@
static int object_key_compare_serials(const void *key1, const void *key2)
(*(const object_key_t **)key2)->serial;
}
(*(const object_key_t **)key2)->serial;
}
-static int do_dump(const json_t *json,
unsigned long
flags, int depth,
+static int do_dump(const json_t *json,
size_t
flags, int depth,
dump_func dump, void *data)
{
int ascii = flags & JSON_ENSURE_ASCII ? 1 : 0;
dump_func dump, void *data)
{
int ascii = flags & JSON_ENSURE_ASCII ? 1 : 0;
@@
-185,7
+185,9
@@
static int do_dump(const json_t *json, unsigned long flags, int depth,
char buffer[MAX_INTEGER_STR_LENGTH];
int size;
char buffer[MAX_INTEGER_STR_LENGTH];
int size;
- size = snprintf(buffer, MAX_INTEGER_STR_LENGTH, "%d", json_integer_value(json));
+ size = snprintf(buffer, MAX_INTEGER_STR_LENGTH,
+ "%" JSON_INTEGER_FORMAT,
+ json_integer_value(json));
if(size >= MAX_INTEGER_STR_LENGTH)
return -1;
if(size >= MAX_INTEGER_STR_LENGTH)
return -1;
@@
-307,8
+309,7
@@
static int do_dump(const json_t *json, unsigned long flags, int depth,
if(flags & JSON_SORT_KEYS || flags & JSON_PRESERVE_ORDER)
{
const object_key_t **keys;
if(flags & JSON_SORT_KEYS || flags & JSON_PRESERVE_ORDER)
{
const object_key_t **keys;
- unsigned int size;
- unsigned int i;
+ size_t size, i;
int (*cmp_func)(const void *, const void *);
size = json_object_size(json);
int (*cmp_func)(const void *, const void *);
size = json_object_size(json);
@@
-415,7
+416,7
@@
static int do_dump(const json_t *json, unsigned long flags, int depth,
}
}
-char *json_dumps(const json_t *json,
unsigned long
flags)
+char *json_dumps(const json_t *json,
size_t
flags)
{
strbuffer_t strbuff;
char *result;
{
strbuffer_t strbuff;
char *result;
@@
-437,7
+438,7
@@
char *json_dumps(const json_t *json, unsigned long flags)
return result;
}
return result;
}
-int json_dumpf(const json_t *json, FILE *output,
unsigned long
flags)
+int json_dumpf(const json_t *json, FILE *output,
size_t
flags)
{
if(!json_is_array(json) && !json_is_object(json))
return -1;
{
if(!json_is_array(json) && !json_is_object(json))
return -1;
@@
-445,7
+446,7
@@
int json_dumpf(const json_t *json, FILE *output, unsigned long flags)
return do_dump(json, flags, 0, dump_to_file, (void *)output);
}
return do_dump(json, flags, 0, dump_to_file, (void *)output);
}
-int json_dump_file(const json_t *json, const char *path,
unsigned long
flags)
+int json_dump_file(const json_t *json, const char *path,
size_t
flags)
{
int result;
{
int result;