From: Pierre Lebleu <pme.lebleu@gmail.com>
Date: Fri, 10 Nov 2017 09:59:35 +0000 (+0100)
Subject: service: fix calls to blobmsg_parse()
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d9dc0e03d70937dbbea12af86997701fbd717dc5;p=oweals%2Fprocd.git

service: fix calls to blobmsg_parse()

We should use blobmsg_data() rather than blob_data() and
blobmsg_data_len() rather than blob_len().

Signed-off-by: Pierre Lebleu <pme.lebleu@gmail.com>
---

diff --git a/service/service.c b/service/service.c
index f539273..9b1318e 100644
--- a/service/service.c
+++ b/service/service.c
@@ -247,7 +247,7 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
 	bool add = !strcmp(method, "add");
 	int ret;
 
-	blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 	cur = tb[SERVICE_SET_NAME];
 	if (!cur)
 		return UBUS_STATUS_INVALID_ARGUMENT;
@@ -307,7 +307,7 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
 	const char *name = NULL;
 	bool verbose = false;
 
-	blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
 	if (tb[SERVICE_LIST_ATTR_VERBOSE])
 		verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
@@ -336,7 +336,7 @@ service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
 	struct service *s;
 	struct service_instance *in;
 
-	blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
 	cur = tb[SERVICE_DEL_ATTR_NAME];
 	if (!cur)
@@ -389,7 +389,7 @@ service_handle_signal(struct ubus_context *ctx, struct ubus_object *obj,
 	int sig = SIGHUP;
 	int rv = 0;
 
-	blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
 	cur = tb[SERVICE_SIGNAL_ATTR_SIGNAL];
 	if (cur)
@@ -428,7 +428,7 @@ service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
 	struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
 	struct service *s;
 
-	blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 
 	cur = tb[SERVICE_SET_NAME];
 	if (!cur)
@@ -456,7 +456,7 @@ service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!msg)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	blobmsg_parse(event_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(event_policy, __EVENT_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 	if (!tb[EVENT_TYPE] || !tb[EVENT_DATA])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
@@ -476,7 +476,7 @@ service_handle_validate(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!msg)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 	if (tb[VALIDATE_SERVICE]) {
 		return 0;
 	}
@@ -505,7 +505,7 @@ service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
 	const char *instance = NULL;
 	const char *type = NULL;
 
-	blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(get_data_policy, __DATA_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
 	if (tb[DATA_NAME])
 		name = blobmsg_data(tb[DATA_NAME]);
 	if (tb[DATA_INSTANCE])