X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=ubus.c;fp=ubus.c;h=39dca359028c453191def2323967b922663f7319;hp=da1ab606762871222768ac768812660cb54bf831;hb=4ead51e17f1e7d7c986daf0cb3f1aeb12d3fe98e;hpb=cd66639800ee2882a0867ec54868502eb9b893d8 diff --git a/ubus.c b/ubus.c index da1ab60..39dca35 100644 --- 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) - 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); - else { - ops->chunk_printf(cl, "\n"); + else return ops->request_done(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); - ops->chunk_printf(cl, "[\n\t"); + ops->chunk_printf(cl, "["); } static void uh_ubus_complete_batch(struct client *cl) { - ops->chunk_printf(cl, "\n]\n"); + ops->chunk_printf(cl, "]"); ops->request_done(cl); }