diff options
| author | Mikhail Galanin <mgalanin@mimecast.com> | 2018-09-10 16:03:11 +0100 |
|---|---|---|
| committer | Mikhail Galanin <mgalanin@mimecast.com> | 2018-09-10 16:03:11 +0100 |
| commit | c83bbd8f504373614e029f187415576494a59a39 (patch) | |
| tree | 94854371e330c03dc302892da71c61762f158bb3 | |
| parent | 5a7984802bc78cbc9424a0a13d6ab95596391e91 (diff) | |
| parent | 583ea41541514ef72e454aebfc05df9aa0d75fb4 (diff) | |
| download | rspamd-c83bbd8f504373614e029f187415576494a59a39.tar.gz rspamd-c83bbd8f504373614e029f187415576494a59a39.zip | |
Merge branch 'master' into redis-coroutines
| -rw-r--r-- | src/rspamadm/lua_repl.c | 4 | ||||
| -rw-r--r-- | src/rspamadm/rspamadm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c index 710b9c5ef..c6c5fd0bf 100644 --- a/src/rspamadm/lua_repl.c +++ b/src/rspamadm/lua_repl.c @@ -287,8 +287,8 @@ rspamadm_exec_input (lua_State *L, const gchar *input) } } -void -wait_session_events () +static void +wait_session_events (void) { /* XXX: it's probably worth to add timeout here - not to wait forever */ while (rspamd_session_events_pending (rspamadm_session) > 0) { diff --git a/src/rspamadm/rspamadm.c b/src/rspamadm/rspamadm.c index fad9b2fcd..052dcd1d6 100644 --- a/src/rspamadm/rspamadm.c +++ b/src/rspamadm/rspamadm.c @@ -323,7 +323,7 @@ rspamadm_command_maybe_match_name (const gchar *cmd, const gchar *input) static void -rspamadm_add_lua_globals() +rspamadm_add_lua_globals (void) { struct rspamd_async_session **psession; struct event_base **pev_base; @@ -444,7 +444,7 @@ main (gint argc, gchar **argv, gchar **env) L = cfg->lua_state; rspamd_lua_set_path (L, NULL, ucl_vars); rspamd_lua_set_globals (cfg, L, ucl_vars); - rspamadm_add_lua_globals(); + rspamadm_add_lua_globals (); #ifdef WITH_HIREDIS rspamd_redis_pool_config (cfg->redis_pool, cfg, rspamd_main->ev_base); |