X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=260e40f2f44b216947cf278ca4d0ad4bbec30a61;hp=9463522488c11782dc9c15c79f1932b37e1149c1;hb=9c13096b169759eabf4c528df22d605e2d6093f4;hpb=24ffe9b582b492054aebb59ac7a175fd65eef5d8 diff --git a/libubus.c b/libubus.c index 9463522..260e40f 100644 --- a/libubus.c +++ b/libubus.c @@ -133,7 +133,7 @@ struct ubus_lookup_request { static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr *msg) { struct ubus_lookup_request *req; - struct ubus_object_data obj; + struct ubus_object_data obj = {}; struct blob_attr **attr; req = container_of(ureq, struct ubus_lookup_request, req); @@ -143,7 +143,6 @@ static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr !attr[UBUS_ATTR_OBJTYPE]) return; - memset(&obj, 0, sizeof(obj)); obj.id = blob_get_u32(attr[UBUS_ATTR_OBJID]); obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]); obj.type_id = blob_get_u32(attr[UBUS_ATTR_OBJTYPE]); @@ -220,7 +219,7 @@ int ubus_register_event_handler(struct ubus_context *ctx, const char *pattern) { struct ubus_object *obj = &ev->obj; - struct blob_buf b2; + struct blob_buf b2 = {}; int ret; if (!obj->id) { @@ -236,7 +235,6 @@ int ubus_register_event_handler(struct ubus_context *ctx, } /* use a second buffer, ubus_invoke() overwrites the primary one */ - memset(&b2, 0, sizeof(b2)); blob_buf_init(&b2, 0); blobmsg_add_u32(&b2, "object", obj->id); if (pattern)