util.ip: remove unused one-letter loop variables [luacheck]

[prosody.git] / util-src / signal.c

diff --git a/util-src/signal.c b/util-src/signal.c
index 4f68c2bf0a552395de198f308e69c0d198751391..725555fa58ec7b79b9dd95f029871de2dc3b79dd 100644 (file)
--- a/util-src/signal.c
+++ b/util-src/signal.c
@@ -32,8 +32,8 @@
 #include "lua.h"
 #include "lauxlib.h"
 
-#if (LUA_VERSION_NUM == 502)
-#define luaL_register(L, N, R) luaL_setfuncs(L, R, 0)
+#if (LUA_VERSION_NUM == 501)
+#define luaL_setfuncs(L, R, N) luaL_register(L, NULL, R)
 #endif
 
 #ifndef lsig
@@ -237,13 +237,14 @@ static int l_signal(lua_State* L) {
                lua_gettable(L, -2);
 
                if(!lua_isnumber(L, -1)) {
-                       luaL_error(L, "invalid signal string");
+                       return luaL_error(L, "invalid signal string");
                }
 
                sig = (int) lua_tonumber(L, -1);
                lua_pop(L, 1); /* get rid of number we pushed */
        } else {
                luaL_checknumber(L, 1);    /* will always error, with good error msg */
+               return luaL_error(L, "unreachable: invalid number was accepted");
        }
 
        /* set handler */
@@ -313,7 +314,7 @@ static int l_raise(lua_State* L) {
                lua_gettable(L, -2);
 
                if(!lua_isnumber(L, -1)) {
-                       luaL_error(L, "invalid signal string");
+                       return luaL_error(L, "invalid signal string");
                }
 
                ret = (lua_Number) raise((int) lua_tonumber(L, -1));
@@ -357,7 +358,7 @@ static int l_kill(lua_State* L) {
                lua_gettable(L, -2);
 
                if(!lua_isnumber(L, -1)) {
-                       luaL_error(L, "invalid signal string");
+                       return luaL_error(L, "invalid signal string");
                }
 
                ret = (lua_Number) kill((int) lua_tonumber(L, 1),
@@ -387,7 +388,7 @@ int luaopen_util_signal(lua_State* L) {
 
        /* add the library */
        lua_newtable(L);
-       luaL_register(L, NULL, lsignal_lib);
+       luaL_setfuncs(L, lsignal_lib, 0);
 
        /* push lua_signals table into the registry */
        /* put the signals inside the library table too,