From fd03e3c9a2f0114455114f63a402c9747a9670ab Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 12 Jan 2021 14:27:31 -0500 Subject: [PATCH] lib-storage: Make dlua_push_mail() take lua_State * directly --- src/lib-storage/mail-lua.c | 24 ++++++++++++------------ src/lib-storage/mail-storage-lua.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib-storage/mail-lua.c b/src/lib-storage/mail-lua.c index be8d16a1b4..018d46d884 100644 --- a/src/lib-storage/mail-lua.c +++ b/src/lib-storage/mail-lua.c @@ -15,31 +15,31 @@ #define LUA_STORAGE_MAIL "struct mail" -void dlua_push_mail(struct dlua_script *script, struct mail *mail) +void dlua_push_mail(lua_State *L, struct mail *mail) { - luaL_checkstack(script->L, 20, "out of memory"); + luaL_checkstack(L, 20, "out of memory"); /* create a table for holding few things */ - lua_createtable(script->L, 0, 20); - luaL_setmetatable(script->L, LUA_STORAGE_MAIL); + lua_createtable(L, 0, 20); + luaL_setmetatable(L, LUA_STORAGE_MAIL); - lua_pushlightuserdata(script->L, mail); - lua_setfield(script->L, -2, "item"); + lua_pushlightuserdata(L, mail); + lua_setfield(L, -2, "item"); #undef LUA_TABLE_SETNUMBER #define LUA_TABLE_SETNUMBER(field) \ - lua_pushnumber(script->L, mail->field); \ - lua_setfield(script->L, -2, #field); + lua_pushnumber(L, mail->field); \ + lua_setfield(L, -2, #field); #undef LUA_TABLE_SETBOOL #define LUA_TABLE_SETBOOL(field) \ - lua_pushboolean(script->L, mail->field); \ - lua_setfield(script->L, -2, #field); + lua_pushboolean(L, mail->field); \ + lua_setfield(L, -2, #field); LUA_TABLE_SETNUMBER(seq); LUA_TABLE_SETNUMBER(uid); LUA_TABLE_SETBOOL(expunged); - dlua_push_mailbox(script->L, mail->box); - lua_setfield(script->L, -2, "mailbox"); + dlua_push_mailbox(L, mail->box); + lua_setfield(L, -2, "mailbox"); } diff --git a/src/lib-storage/mail-storage-lua.h b/src/lib-storage/mail-storage-lua.h index 6fdded48ca..38738c9b85 100644 --- a/src/lib-storage/mail-storage-lua.h +++ b/src/lib-storage/mail-storage-lua.h @@ -12,6 +12,6 @@ struct dlua_script; void dlua_register_mail_storage(struct dlua_script *script); void dlua_push_mail_user(lua_State *L, struct mail_user *user); void dlua_push_mailbox(lua_State *L, struct mailbox *box); -void dlua_push_mail(struct dlua_script *script, struct mail *mail); +void dlua_push_mail(lua_State *L, struct mail *mail); #endif -- 2.47.3