lib-storage: Make lua_storage_cmp() take lua_State * directly

diff --git a/src/lib-storage/mail-storage-lua-private.h b/src/lib-storage/mail-storage-lua-private.h
index dcae42b581ca7eb6fabc91b6d944fb5381dfec0e..3ac169e0a8aa3cb72d8cc8fe0e97762d2e27b805 100644 (file)
--- a/src/lib-storage/mail-storage-lua-private.h
+++ b/src/lib-storage/mail-storage-lua-private.h
@@ -16,7 +16,7 @@ void lua_storage_mail_register(struct dlua_script *script);
 void lua_storage_mail_user_register(struct dlua_script *script);
 void lua_storage_mailbox_register(struct dlua_script *script);
 
-int lua_storage_cmp(struct dlua_script *script);
+int lua_storage_cmp(lua_State *L);
 
 int lua_storage_mailbox_attribute_get(struct mailbox *box, const char *key,
                                      const char **value_r, size_t *value_len_r,

diff --git a/src/lib-storage/mail-user-lua.c b/src/lib-storage/mail-user-lua.c
index 6619cff08d09d2def54fcebdf2e5b23ae28e4534..1d3a0f85e29a2b5dd51d0679ea1836df9d43a711 100644 (file)
--- a/src/lib-storage/mail-user-lua.c
+++ b/src/lib-storage/mail-user-lua.c
@@ -93,38 +93,35 @@ static int lua_storage_mail_user_tostring(lua_State *L)
        return 1;
 }
 
-int lua_storage_cmp(struct dlua_script *script)
+int lua_storage_cmp(lua_State *L)
 {
        const char *name_a, *name_b;
-       name_a = lua_tostring(script->L, 1);
-       name_b = lua_tostring(script->L, 2);
+       name_a = lua_tostring(L, 1);
+       name_b = lua_tostring(L, 2);
 
        return strcmp(name_a, name_b);
 }
 
 static int lua_storage_mail_user_eq(lua_State *L)
 {
-       struct dlua_script *script = dlua_script_from_state(L);
        DLUA_REQUIRE_ARGS(L, 2);
-       bool res = lua_storage_cmp(script) == 0;
+       bool res = lua_storage_cmp(L) == 0;
        lua_pushboolean(L, res);
        return 1;
 }
 
 static int lua_storage_mail_user_lt(lua_State *L)
 {
-       struct dlua_script *script = dlua_script_from_state(L);
        DLUA_REQUIRE_ARGS(L, 2);
-       bool res = lua_storage_cmp(script) <= 0;
+       bool res = lua_storage_cmp(L) <= 0;
        lua_pushboolean(L, res);
        return 1;
 }
 
 static int lua_storage_mail_user_le(lua_State *L)
 {
-       struct dlua_script *script = dlua_script_from_state(L);
        DLUA_REQUIRE_ARGS(L, 2);
-       bool res = lua_storage_cmp(script) < 0;
+       bool res = lua_storage_cmp(L) < 0;
        lua_pushboolean(L, res);
        return 1;
 }

diff --git a/src/lib-storage/mailbox-lua.c b/src/lib-storage/mailbox-lua.c
index 22dac2f4209ee375a4c3c8062e8246c7f1b51827..681b074870d7f0efddc8f94b8d88ed7a3a22e9ba 100644 (file)
--- a/src/lib-storage/mailbox-lua.c
+++ b/src/lib-storage/mailbox-lua.c
@@ -79,7 +79,7 @@ static int lua_storage_mailbox_lt(lua_State *L)
 {
        struct dlua_script *script = dlua_script_from_state(L);
        DLUA_REQUIRE_ARGS(L, 2);
-       bool res = lua_storage_cmp(script) <= 0;
+       bool res = lua_storage_cmp(L) <= 0;
        lua_pushboolean(script->L, res);
        return 1;
 }
@@ -88,7 +88,7 @@ static int lua_storage_mailbox_le(lua_State *L)
 {
        struct dlua_script *script = dlua_script_from_state(L);
        DLUA_REQUIRE_ARGS(L, 2);
-       bool res = lua_storage_cmp(script) < 0;
+       bool res = lua_storage_cmp(L) < 0;
        lua_pushboolean(script->L, res);
        return 1;
 }