diff options
| author | Rosen Penev <rosenp@gmail.com> | 2017-11-07 12:34:20 -0800 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-11-13 09:46:12 +0100 |
| commit | 9c13096b169759eabf4c528df22d605e2d6093f4 (patch) | |
| tree | dce963c702c4d589a2cf7cb0ab1a865e538b47b9 /libubus.c | |
| parent | 24ffe9b582b492054aebb59ac7a175fd65eef5d8 (diff) | |
| download | ubus-9c13096b169759eabf4c528df22d605e2d6093f4.tar.gz | |
ubus: Remove unnecessary memset calls.
Replace malloc+memset with calloc.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'libubus.c')
| -rw-r--r-- | libubus.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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) |