projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libubus: expose ubus_connect_ctx() in public API
[project/ubus.git]
/
ubusd_obj.c
diff --git
a/ubusd_obj.c
b/ubusd_obj.c
index
69ca8b8
..
8923821
100644
(file)
--- a/
ubusd_obj.c
+++ b/
ubusd_obj.c
@@
-164,12
+164,12
@@
free:
return NULL;
}
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);
{
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;
if (!s)
return;
@@
-177,7
+177,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);
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);
if (first)
ubus_notify_subscription(target);
@@
-220,7
+219,7
@@
void ubusd_free_object(struct ubus_object *obj)
free(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);
{
ubus_init_id_tree(&objects);
ubus_init_id_tree(&obj_types);