projects
/
project
/
uhttpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd66639
)
ubus: remove indentation and whitespace from JSON responses to conserve a bit of...
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 27 Nov 2013 18:30:17 +0000
(18:30 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 27 Nov 2013 18:30:17 +0000
(18:30 +0000)
ubus.c
patch
|
blob
|
history
diff --git
a/ubus.c
b/ubus.c
index da1ab606762871222768ac768812660cb54bf831..39dca359028c453191def2323967b922663f7319 100644
(file)
--- a/
ubus.c
+++ b/
ubus.c
@@
-127,19
+127,17
@@
static void uh_ubus_send_response(struct client *cl)
char *str;
if (du->array && du->array_idx > 1)
char *str;
if (du->array && du->array_idx > 1)
- sep = ",
";
+ sep = ",";
- str = blobmsg_format_json
_indent(buf.head, true, du->array
);
+ str = blobmsg_format_json
(buf.head, true
);
ops->chunk_printf(cl, "%s%s", sep, str);
free(str);
du->jsobj_cur = NULL;
if (du->array)
uh_ubus_next_batched_request(cl);
ops->chunk_printf(cl, "%s%s", sep, str);
free(str);
du->jsobj_cur = NULL;
if (du->array)
uh_ubus_next_batched_request(cl);
- else {
- ops->chunk_printf(cl, "\n");
+ else
return ops->request_done(cl);
return ops->request_done(cl);
- }
}
static void uh_ubus_init_response(struct client *cl)
}
static void uh_ubus_init_response(struct client *cl)
@@
-419,12
+417,12
@@
static void uh_ubus_init_batch(struct client *cl)
du->array = true;
uh_ubus_send_header(cl);
du->array = true;
uh_ubus_send_header(cl);
- ops->chunk_printf(cl, "[
\n\t
");
+ ops->chunk_printf(cl, "[");
}
static void uh_ubus_complete_batch(struct client *cl)
{
}
static void uh_ubus_complete_batch(struct client *cl)
{
- ops->chunk_printf(cl, "
\n]\n
");
+ ops->chunk_printf(cl, "
]
");
ops->request_done(cl);
}
ops->request_done(cl);
}