diff options
author | Kim Alvefur <zash@zash.se> | 2017-02-14 23:42:11 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-02-14 23:42:11 +0100 |
commit | 885e117a1fe2f0a77d330c89ad5e44636f25815e (patch) | |
tree | 2b8a5826f55d17228f3c87145bc37f798272f98c /util-src/signal.c | |
parent | 89a1476a741679c8b39ec5443fd921fb26f338a3 (diff) | |
parent | 0d09c3499df3a314e2fcd6495d495fb69d30809f (diff) | |
download | prosody-885e117a1fe2f0a77d330c89ad5e44636f25815e.tar.gz prosody-885e117a1fe2f0a77d330c89ad5e44636f25815e.zip |
Merge 0.10->trunk
Diffstat (limited to 'util-src/signal.c')
-rw-r--r-- | util-src/signal.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/util-src/signal.c b/util-src/signal.c index 3f29febb..a083df54 100644 --- a/util-src/signal.c +++ b/util-src/signal.c @@ -41,7 +41,7 @@ #define lsig struct lua_signal { - char* name; /* name of the signal */ + char *name; /* name of the signal */ int sig; /* the signal */ }; @@ -153,20 +153,20 @@ static const struct lua_signal lua_signals[] = { {NULL, 0} }; -static lua_State* Lsig = NULL; +static lua_State *Lsig = NULL; static lua_Hook Hsig = NULL; static int Hmask = 0; static int Hcount = 0; static struct signal_event { int Nsig; - struct signal_event* next_event; -}* signal_queue = NULL; + struct signal_event *next_event; +} *signal_queue = NULL; -static struct signal_event* last_event = NULL; +static struct signal_event *last_event = NULL; -static void sighook(lua_State* L, lua_Debug* ar) { - struct signal_event* event; +static void sighook(lua_State *L, lua_Debug *ar) { + struct signal_event *event; /* restore the old hook */ lua_sethook(L, Hsig, Hmask, Hcount); @@ -220,7 +220,7 @@ static void handle(int sig) { * in an unstable state. */ -static int l_signal(lua_State* L) { +static int l_signal(lua_State *L) { int args = lua_gettop(L); int t, sig; /* type, signal */ @@ -295,7 +295,7 @@ static int l_signal(lua_State* L) { * signal = signal number or string */ -static int l_raise(lua_State* L) { +static int l_raise(lua_State *L) { /* int args = lua_gettop(L); */ int t = 0; /* type */ lua_Number ret; @@ -338,7 +338,7 @@ static int l_raise(lua_State* L) { * signal = signal number or string */ -static int l_kill(lua_State* L) { +static int l_kill(lua_State *L) { int t; /* type */ lua_Number ret; /* return value */ @@ -383,7 +383,7 @@ static const struct luaL_Reg lsignal_lib[] = { {NULL, NULL} }; -int luaopen_util_signal(lua_State* L) { +int luaopen_util_signal(lua_State *L) { #if (LUA_VERSION_NUM > 501) luaL_checkversion(L); #endif |