X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubusd_obj.c;h=62c2331c50aba30be8258ffbcb53816f773a8a67;hb=8309c75828acbcee73b11d9ce90d76b7ef14b891;hp=69ca8b871fd8c6a3cfc83dd04945cb897bac71be;hpb=a69f062cbd4041229f8d29ef9647bf783df414c1;p=project%2Fubus.git

diff --git a/ubusd_obj.c b/ubusd_obj.c
index 69ca8b8..62c2331 100644
--- a/ubusd_obj.c
+++ b/ubusd_obj.c
@@ -58,6 +58,9 @@ static struct ubus_object_type *ubus_create_obj_type(struct blob_attr *sig)
 	int rem;
 
 	type = calloc(1, sizeof(*type));
+	if (!type)
+		return NULL;
+
 	type->refcount = 1;
 
 	if (!ubus_alloc_id(&obj_types, &type->id, 0))
@@ -164,12 +167,12 @@ free:
 	return NULL;
 }
 
-void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target, const char *method)
+void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target)
 {
 	struct ubus_subscription *s;
 	bool first = list_empty(&target->subscribers);
 
-	s = calloc(1, sizeof(*s) + strlen(method) + 1);
+	s = calloc(1, sizeof(*s));
 	if (!s)
 		return;
 
@@ -177,7 +180,6 @@ void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target, const c
 	s->target = target;
 	list_add(&s->list, &target->subscribers);
 	list_add(&s->target_list, &obj->target_list);
-	strcpy(s->method, method);
 
 	if (first)
 		ubus_notify_subscription(target);
@@ -220,7 +222,7 @@ void ubusd_free_object(struct ubus_object *obj)
 	free(obj);
 }
 
-static void __init ubusd_obj_init(void)
+static void __constructor ubusd_obj_init(void)
 {
 	ubus_init_id_tree(&objects);
 	ubus_init_id_tree(&obj_types);