projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0'
[jansson.git]
/
src
/
dump.c
diff --git
a/src/dump.c
b/src/dump.c
index
28c00b9
..
93717ab
100644
(file)
--- a/
src/dump.c
+++ b/
src/dump.c
@@
-9,7
+9,6
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <jansson.h>
#include "strbuffer.h"
#include <jansson.h>
#include "strbuffer.h"
@@
-36,22
+35,23
@@
static int dump_to_file(const char *buffer, int size, void *data)
return 0;
}
return 0;
}
-static int dump_indent(uint32_t flags, int depth, dump_func dump, void *data)
+/* 256 spaces (the maximum indentation size) */
+static char whitespace[] = " ";
+
+static int dump_indent(unsigned long flags, int depth, dump_func dump, void *data)
{
if(JSON_INDENT(flags) > 0)
{
{
if(JSON_INDENT(flags) > 0)
{
- char *ws_buffer;
- int ws_count = JSON_INDENT(flags) * depth;
+ int i, ws_count = JSON_INDENT(flags);
if(dump("\n", 1, data))
return -1;
if(dump("\n", 1, data))
return -1;
- if(ws_count == 0)
- return 0;
-
- ws_buffer = alloca(ws_count);
- memset(ws_buffer, ' ', ws_count);
- return dump(ws_buffer, ws_count, data);
+ for(i = 0; i < depth; i++)
+ {
+ if(dump(whitespace, ws_count, data))
+ return -1;
+ }
}
return 0;
}
}
return 0;
}
@@
-111,7
+111,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)) {
@@
-232,7
+232,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;
@@
-255,7
+255,7
@@
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;
@@
-265,7
+265,7
@@
int json_dumpf(const json_t *json, FILE *output, uint32_t flags)
return dump_to_file("\n", 1, (void *)output);
}
return dump_to_file("\n", 1, (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;