summaryrefslogtreecommitdiff
path: root/cli.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-01-31 17:27:08 +0100
committerFelix Fietkau <nbd@openwrt.org>2011-01-31 17:27:11 +0100
commit23c9984a6cfe110f0112296d337978862ab34123 (patch)
tree02f1a0d16eaa22fd5c1dab467ee8050d7069dbb2 /cli.c
parent57615abd9b8c4d272e0e97ba1e9dec4bc3baf62f (diff)
downloadubus-23c9984a6cfe110f0112296d337978862ab34123.tar.gz
cli: use ubus_invoke() instead of low level handling
Diffstat (limited to 'cli.c')
-rw-r--r--cli.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/cli.c b/cli.c
index a1c90fe..45addc6 100644
--- a/cli.c
+++ b/cli.c
@@ -96,6 +96,7 @@ int main(int argc, char **argv)
ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0);
req.raw_data_cb = receive_lookup;
+ ret = ubus_complete_request(ctx, &req);
} else if (!strcmp(cmd, "call")) {
if (argc < 4 || argc > 5)
return usage(argv[0]);
@@ -105,16 +106,11 @@ int main(int argc, char **argv)
return 1;
}
- blob_buf_init(&b, 0);
- blob_put_int32(&b, UBUS_ATTR_OBJID, objid);
- blob_put_string(&b, UBUS_ATTR_METHOD, argv[3]);
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, objid);
- req.data_cb = receive_data;
+ ret = ubus_invoke(ctx, objid, argv[3], NULL, receive_data, NULL);
} else {
return usage(argv[0]);
}
- ret = ubus_complete_request(ctx, &req);
if (ret)
fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));