X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_obj.c;h=8923821e0827fe3fb904ae57e212ed7cc33f0016;hp=69ca8b871fd8c6a3cfc83dd04945cb897bac71be;hb=7b79b6226e737e28aafb4e9b668b86b5f180314b;hpb=a69f062cbd4041229f8d29ef9647bf783df414c1 diff --git a/ubusd_obj.c b/ubusd_obj.c index 69ca8b8..8923821 100644 --- a/ubusd_obj.c +++ b/ubusd_obj.c @@ -164,12 +164,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 +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); - strcpy(s->method, method); if (first) ubus_notify_subscription(target); @@ -220,7 +219,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);