@@ -33,7 +33,7 @@ struct json_writer {
static void jsonw_indent(json_writer_t *self)
{
unsigned i;
- for (i = 0; i <= self->depth; ++i)
+ for (i = 0; i < self->depth; ++i)
fputs(" ", self->out);
}
@@ -102,7 +102,6 @@ json_writer_t *jsonw_new(FILE *f)
self->depth = 0;
self->pretty = false;
self->sep = '\0';
- putc('{', self->out);
}
return self;
}
@@ -113,8 +112,7 @@ void jsonw_destroy(json_writer_t **self_p)
json_writer_t *self = *self_p;
assert(self->depth == 0);
- jsonw_eol(self);
- fputs("}\n", self->out);
+ fputs("\n", self->out);
fflush(self->out);
free(self);
*self_p = NULL;
@@ -269,6 +267,7 @@ int main(int argc, char **argv)
{
json_writer_t *wr = jsonw_new(stdout);
+ jsonw_start_object(wr);
jsonw_pretty(wr, true);
jsonw_name(wr, "Vyatta");
jsonw_start_object(wr);
@@ -305,6 +304,7 @@ int main(int argc, char **argv)
jsonw_end_object(wr);
+ jsonw_end_object(wr);
jsonw_destroy(&wr);
return 0;
}
@@ -245,6 +245,7 @@ static void dump_raw_db(FILE *fp, int to_hist)
h = hist_db;
if (jw) {
+ jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
@@ -288,6 +289,8 @@ static void dump_raw_db(FILE *fp, int to_hist)
}
if (jw) {
jsonw_end_object(jw);
+
+ jsonw_end_object(jw);
jsonw_destroy(&jw);
}
}
@@ -451,6 +454,7 @@ static void dump_kern_db(FILE *fp)
struct ifstat_ent *n;
if (jw) {
+ jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
@@ -477,6 +481,7 @@ static void dump_incr_db(FILE *fp)
h = hist_db;
if (jw) {
+ jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
@@ -509,6 +514,8 @@ static void dump_incr_db(FILE *fp)
if (jw) {
jsonw_end_object(jw);
+
+ jsonw_end_object(jw);
jsonw_destroy(&jw);
}
}
@@ -284,6 +284,7 @@ static void dump_kern_db(FILE *fp, int to_hist)
h = hist_db;
if (jw) {
+ jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
@@ -317,6 +318,8 @@ static void dump_kern_db(FILE *fp, int to_hist)
if (jw) {
jsonw_end_object(jw);
+
+ jsonw_end_object(jw);
jsonw_destroy(&jw);
}
}
@@ -328,6 +331,7 @@ static void dump_incr_db(FILE *fp)
h = hist_db;
if (jw) {
+ jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
@@ -364,6 +368,8 @@ static void dump_incr_db(FILE *fp)
if (jw) {
jsonw_end_object(jw);
+
+ jsonw_end_object(jw);
jsonw_destroy(&jw);
}
}