From 8a9ffa6ec88d2b199d9262666dadcd962da82fb5 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 29 Jan 2014 17:33:50 +0000 Subject: fix the dump logic to show validators and triggers even if no instances exist Signed-off-by: John Crispin --- service/service.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/service/service.c b/service/service.c index 3ec24c3..3fc8424 100644 --- a/service/service.c +++ b/service/service.c @@ -259,15 +259,12 @@ service_dump(struct service *s, int verbose) c = blobmsg_open_table(&b, s->name); - if (avl_is_empty(&s->instances.avl)) { - blobmsg_close_table(&b, c); - return; + if (!avl_is_empty(&s->instances.avl)) { + i = blobmsg_open_table(&b, "instances"); + vlist_for_each_element(&s->instances, in, node) + instance_dump(&b, in, verbose); + blobmsg_close_table(&b, i); } - - i = blobmsg_open_table(&b, "instances"); - vlist_for_each_element(&s->instances, in, node) - instance_dump(&b, in, verbose); - blobmsg_close_table(&b, i); if (verbose && s->trigger) blobmsg_add_blob(&b, s->trigger); if (verbose && !list_empty(&s->validators)) -- cgit v1.2.3