ubus: Remove unnecessary memset calls.

[project/ubus.git] / lua / ubus.c

diff --git a/lua/ubus.c b/lua/ubus.c
index f59af90..cfe9c9b 100644 (file)
--- a/lua/ubus.c
+++ b/lua/ubus.c
@@ -352,6 +352,26 @@ static int ubus_lua_reply(lua_State *L)
        return 0;
 }
 
+static int ubus_lua_defer_request(lua_State *L)
+{
+       struct ubus_lua_connection *c = luaL_checkudata(L, 1, METANAME);
+       struct ubus_request_data *req = lua_touserdata(L, 2);
+       struct ubus_request_data *new_req = lua_newuserdata(L, sizeof(struct ubus_request_data));
+       ubus_defer_request(c->ctx, req, new_req);
+
+       return 1;
+}
+
+static int ubus_lua_complete_deferred_request(lua_State *L)
+{
+       struct ubus_lua_connection *c = luaL_checkudata(L, 1, METANAME);
+       struct ubus_request_data *req = lua_touserdata(L, 2);
+       int ret = luaL_checkinteger(L, 3);
+       ubus_complete_deferred_request(c->ctx, req, ret);
+
+       return 0;
+}
+
 static int ubus_lua_load_methods(lua_State *L, struct ubus_method *m)
 {
        struct blobmsg_policy *p;
@@ -390,11 +410,10 @@ static int ubus_lua_load_methods(lua_State *L, struct ubus_method *m)
        }
 
        /* setup the policy pointers */
-       p = malloc(sizeof(struct blobmsg_policy) * plen);
+       p = calloc(plen, sizeof(struct blobmsg_policy));
        if (!p)
                return 1;
 
-       memset(p, 0, sizeof(struct blobmsg_policy) * plen);
        m->policy = p;
        lua_pushnil(L);
        while (lua_next(L, -2) != 0) {
@@ -461,26 +480,23 @@ static struct ubus_object* ubus_lua_load_object(lua_State *L)
        int midx = 0;
 
        /* setup object pointers */
-       obj = malloc(sizeof(struct ubus_lua_object));
+       obj = calloc(1, sizeof(struct ubus_lua_object));
        if (!obj)
                return NULL;
 
-       memset(obj, 0, sizeof(struct ubus_lua_object));
        obj->o.name = lua_tostring(L, -2);
 
        /* setup method pointers */
-       m = malloc(sizeof(struct ubus_method) * mlen);
-       memset(m, 0, sizeof(struct ubus_method) * mlen);
+       m = calloc(mlen, sizeof(struct ubus_method));
        obj->o.methods = m;
 
        /* setup type pointers */
-       obj->o.type = malloc(sizeof(struct ubus_object_type));
+       obj->o.type = calloc(1, sizeof(struct ubus_object_type));
        if (!obj->o.type) {
                free(obj);
                return NULL;
        }
 
-       memset(obj->o.type, 0, sizeof(struct ubus_object_type));
        obj->o.type->name = lua_tostring(L, -2);
        obj->o.type->id = 0;
        obj->o.type->methods = obj->o.methods;
@@ -695,11 +711,10 @@ ubus_lua_load_event(lua_State *L)
 {
        struct ubus_lua_event* event = NULL;
 
-       event = malloc(sizeof(struct ubus_lua_event));
+       event = calloc(1, sizeof(struct ubus_lua_event));
        if (!event)
                return NULL;
 
-       memset(event, 0, sizeof(struct ubus_lua_event));
        event->e.cb = ubus_event_handler;
 
        /* update the he callback lookup table */
@@ -798,8 +813,7 @@ ubus_lua_do_subscribe( struct ubus_context *ctx, lua_State *L, const char* targe
                lua_error( L );
        }
 
-       sub = malloc( sizeof( struct ubus_lua_subscriber ) );
-       memset( sub, 0, sizeof( struct ubus_lua_subscriber ) );
+       sub = calloc( 1, sizeof( struct ubus_lua_subscriber ) );
        if( !sub ){
                lua_pushstring( L, "Out of memory" );
                lua_error( L );
@@ -920,6 +934,8 @@ static const luaL_Reg ubus[] = {
        { "add", ubus_lua_add },
        { "notify", ubus_lua_notify },
        { "reply", ubus_lua_reply },
+       { "defer_request", ubus_lua_defer_request },
+       { "complete_deferred_request", ubus_lua_complete_deferred_request },
        { "signatures", ubus_lua_signatures },
        { "call", ubus_lua_call },
        { "close", ubus_lua__gc },