nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-node-info: simplify respondd module code a bit

Browse Source
This commit is contained in:
Jan-Philipp Litza 2016-05-27 22:40:17 +02:00
parent f7eda9381f
commit 76c3456787
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/gluon-node-info/src/respondd.c
View File

@ -69,6 +69,12 @@ static struct json_object * get_number(struct uci_context *ctx, struct uci_secti
return jso; return jso;
} }
static void maybe_add_number(struct uci_context *ctx, struct uci_section *s, const char *name, struct json_object *parent) {
struct json_object *jso = get_number(ctx, s, name);
if (jso)
json_object_object_add(parent, name, jso);
}
static struct json_object * get_location(struct uci_context *ctx, struct uci_package *p) { static struct json_object * get_location(struct uci_context *ctx, struct uci_package *p) {
struct uci_section *s = get_first_section(p, "location"); struct uci_section *s = get_first_section(p, "location");
if (!s) if (!s)
@ -80,17 +86,9 @@ static struct json_object * get_location(struct uci_context *ctx, struct uci_pac
struct json_object *ret = json_object_new_object(); struct json_object *ret = json_object_new_object();
struct json_object *latitude = get_number(ctx, s, "latitude"); maybe_add_number(ctx, s, "latitude", ret);
if (latitude) maybe_add_number(ctx, s, "longitude", ret);
json_object_object_add(ret, "latitude", latitude); maybe_add_number(ctx, s, "altitude", ret);
struct json_object *longitude = get_number(ctx, s, "longitude");
if (longitude)
json_object_object_add(ret, "longitude", longitude);
struct json_object *altitude = get_number(ctx, s, "altitude");
if (altitude)
json_object_object_add(ret, "altitude", altitude);
return ret; return ret;
} }