projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dump: Revise whitespace usage
[jansson.git]
/
src
/
dump.c
diff --git
a/src/dump.c
b/src/dump.c
index
9505b7f
..
ac0b8dc
100644
(file)
--- a/
src/dump.c
+++ b/
src/dump.c
@@
-11,8
+11,12
@@
#include <string.h>
#include <jansson.h>
#include <string.h>
#include <jansson.h>
+#include "jansson_private.h"
#include "strbuffer.h"
#include "strbuffer.h"
+#define MAX_INTEGER_STR_LENGTH 100
+#define MAX_REAL_STR_LENGTH 100
+
typedef int (*dump_func)(const char *buffer, int size, void *data);
struct string
typedef int (*dump_func)(const char *buffer, int size, void *data);
struct string
@@
-38,7
+42,7
@@
static int dump_to_file(const char *buffer, int size, void *data)
/* 256 spaces (the maximum indentation size) */
static char whitespace[] = " ";
/* 256 spaces (the maximum indentation size) */
static char whitespace[] = " ";
-static int dump_indent(u
int32_t flags, int depth
, dump_func dump, void *data)
+static int dump_indent(u
nsigned long flags, int depth, int space
, dump_func dump, void *data)
{
if(JSON_INDENT(flags) > 0)
{
{
if(JSON_INDENT(flags) > 0)
{
@@
-53,6
+57,10
@@
static int dump_indent(uint32_t flags, int depth, dump_func dump, void *data)
return -1;
}
}
return -1;
}
}
+ else if(space && !(flags & JSON_COMPACT))
+ {
+ return dump(" ", 1, data);
+ }
return 0;
}
return 0;
}
@@
-70,7
+78,7
@@
static int dump_string(const char *str, dump_func dump, void *data)
char seq[7];
int length;
char seq[7];
int length;
- while(*end && *end != '\\' && *end != '"' && (
*end < 0 || *end > 0x1F)
)
+ while(*end && *end != '\\' && *end != '"' && (
unsigned char)*end > 0x1F
)
end++;
if(end != str) {
end++;
if(end != str) {
@@
-111,7
+119,7
@@
static int dump_string(const char *str, dump_func dump, void *data)
return dump("\"", 1, data);
}
return dump("\"", 1, data);
}
-static int do_dump(const json_t *json, u
int32_t
flags, int depth,
+static int do_dump(const json_t *json, u
nsigned long
flags, int depth,
dump_func dump, void *data)
{
switch(json_typeof(json)) {
dump_func dump, void *data)
{
switch(json_typeof(json)) {
@@
-126,30
+134,26
@@
static int do_dump(const json_t *json, uint32_t flags, int depth,
case JSON_INTEGER:
{
case JSON_INTEGER:
{
- char
*buffer
;
- int size
, ret
;
+ char
buffer[MAX_INTEGER_STR_LENGTH]
;
+ int size;
- size =
asprintf(&buffer
, "%d", json_integer_value(json));
- if(size
== -1
)
+ size =
snprintf(buffer, MAX_INTEGER_STR_LENGTH
, "%d", json_integer_value(json));
+ if(size
>= MAX_INTEGER_STR_LENGTH
)
return -1;
return -1;
- ret = dump(buffer, size, data);
- free(buffer);
- return ret;
+ return dump(buffer, size, data);
}
case JSON_REAL:
{
}
case JSON_REAL:
{
- char
*buffer
;
- int size
, ret
;
+ char
buffer[MAX_REAL_STR_LENGTH]
;
+ int size;
- size =
asprintf(&buffer, "%
.17f", json_real_value(json));
- if(size
== -1
)
+ size =
snprintf(buffer, MAX_REAL_STR_LENGTH, "%0
.17f", json_real_value(json));
+ if(size
>= MAX_REAL_STR_LENGTH
)
return -1;
return -1;
- ret = dump(buffer, size, data);
- free(buffer);
- return ret;
+ return dump(buffer, size, data);
}
case JSON_STRING:
}
case JSON_STRING:
@@
-158,13
+162,22
@@
static int do_dump(const json_t *json, uint32_t flags, int depth,
case JSON_ARRAY:
{
int i;
case JSON_ARRAY:
{
int i;
- int n = json_array_size(json);
+ int n;
+ json_array_t *array;
+
+ /* detect circular references */
+ array = json_to_array(json);
+ if(array->visited)
+ return -1;
+ array->visited = 1;
+
+ n = json_array_size(json);
if(dump("[", 1, data))
return -1;
if(n == 0)
return dump("]", 1, data);
if(dump("[", 1, data))
return -1;
if(n == 0)
return dump("]", 1, data);
- if(dump_indent(flags, depth + 1, dump, data))
+ if(dump_indent(flags, depth + 1,
0,
dump, data))
return -1;
for(i = 0; i < n; ++i) {
return -1;
for(i = 0; i < n; ++i) {
@@
-175,27
+188,49
@@
static int do_dump(const json_t *json, uint32_t flags, int depth,
if(i < n - 1)
{
if(dump(",", 1, data) ||
if(i < n - 1)
{
if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, dump, data))
+ dump_indent(flags, depth + 1,
1,
dump, data))
return -1;
}
else
{
return -1;
}
else
{
- if(dump_indent(flags, depth, dump, data))
+ if(dump_indent(flags, depth,
0,
dump, data))
return -1;
}
}
return -1;
}
}
+
+ array->visited = 0;
return dump("]", 1, data);
}
case JSON_OBJECT:
{
return dump("]", 1, data);
}
case JSON_OBJECT:
{
- void *iter = json_object_iter((json_t *)json);
+ json_object_t *object;
+ void *iter;
+ const char *separator;
+ int separator_length;
+
+ if(flags & JSON_COMPACT) {
+ separator = ":";
+ separator_length = 1;
+ }
+ else {
+ separator = ": ";
+ separator_length = 2;
+ }
+
+ /* detect circular references */
+ object = json_to_object(json);
+ if(object->visited)
+ return -1;
+ object->visited = 1;
+
+ iter = json_object_iter((json_t *)json);
if(dump("{", 1, data))
return -1;
if(!iter)
return dump("}", 1, data);
if(dump("{", 1, data))
return -1;
if(!iter)
return dump("}", 1, data);
- if(dump_indent(flags, depth + 1, dump, data))
+ if(dump_indent(flags, depth + 1,
0,
dump, data))
return -1;
while(iter)
return -1;
while(iter)
@@
-203,7
+238,7
@@
static int do_dump(const json_t *json, uint32_t flags, int depth,
void *next = json_object_iter_next((json_t *)json, iter);
dump_string(json_object_iter_key(iter), dump, data);
void *next = json_object_iter_next((json_t *)json, iter);
dump_string(json_object_iter_key(iter), dump, data);
- if(dump(
": ", 2
, data) ||
+ if(dump(
separator, separator_length
, data) ||
do_dump(json_object_iter_value(iter), flags, depth + 1,
dump, data))
return -1;
do_dump(json_object_iter_value(iter), flags, depth + 1,
dump, data))
return -1;
@@
-211,17
+246,19
@@
static int do_dump(const json_t *json, uint32_t flags, int depth,
if(next)
{
if(dump(",", 1, data) ||
if(next)
{
if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, dump, data))
+ dump_indent(flags, depth + 1,
1,
dump, data))
return -1;
}
else
{
return -1;
}
else
{
- if(dump_indent(flags, depth, dump, data))
+ if(dump_indent(flags, depth,
0,
dump, data))
return -1;
}
iter = next;
}
return -1;
}
iter = next;
}
+
+ object->visited = 0;
return dump("}", 1, data);
}
return dump("}", 1, data);
}
@@
-232,7
+269,7
@@
static int do_dump(const json_t *json, uint32_t flags, int depth,
}
}
-char *json_dumps(const json_t *json, u
int32_t
flags)
+char *json_dumps(const json_t *json, u
nsigned long
flags)
{
strbuffer_t strbuff;
char *result;
{
strbuffer_t strbuff;
char *result;
@@
-241,13
+278,12
@@
char *json_dumps(const json_t *json, uint32_t flags)
return NULL;
if(strbuffer_init(&strbuff))
return NULL;
if(strbuffer_init(&strbuff))
- return NULL;
-
- if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff))
return NULL;
return NULL;
- if(dump_to_strbuffer("\n", 1, (void *)&strbuff))
+ if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff)) {
+ strbuffer_close(&strbuff);
return NULL;
return NULL;
+ }
result = strdup(strbuffer_value(&strbuff));
strbuffer_close(&strbuff);
result = strdup(strbuffer_value(&strbuff));
strbuffer_close(&strbuff);
@@
-255,17
+291,15
@@
char *json_dumps(const json_t *json, uint32_t flags)
return result;
}
return result;
}
-int json_dumpf(const json_t *json, FILE *output, u
int32_t
flags)
+int json_dumpf(const json_t *json, FILE *output, u
nsigned long
flags)
{
if(!json_is_array(json) && !json_is_object(json))
return -1;
{
if(!json_is_array(json) && !json_is_object(json))
return -1;
- if(do_dump(json, flags, 0, dump_to_file, (void *)output))
- return -1;
- return dump_to_file("\n", 1, (void *)output);
+ return do_dump(json, flags, 0, dump_to_file, (void *)output);
}
}
-int json_dump_file(const json_t *json, const char *path, u
int32_t
flags)
+int json_dump_file(const json_t *json, const char *path, u
nsigned long
flags)
{
int result;
{
int result;