diff --git a/src/output-lua-common.c b/src/output-lua-common.c index aec17e0002..d89007738e 100644 --- a/src/output-lua-common.c +++ b/src/output-lua-common.c @@ -76,7 +76,7 @@ const char *LuaGetStringArgument(lua_State *luastate, int argc) return str; } -void LogLuaPushTableKeyValueInt(lua_State *luastate, const char *key, int value) +void LuaPushTableKeyValueInt(lua_State *luastate, const char *key, int value) { lua_pushstring(luastate, key); lua_pushnumber(luastate, value); @@ -87,14 +87,14 @@ void LogLuaPushTableKeyValueInt(lua_State *luastate, const char *key, int value) * * If value is NULL, string "(null")" will be put on the stack. */ -void LogLuaPushTableKeyValueString(lua_State *luastate, const char *key, const char *value) +void LuaPushTableKeyValueString(lua_State *luastate, const char *key, const char *value) { lua_pushstring(luastate, key); lua_pushstring(luastate, value ? value : "(null)"); lua_settable(luastate, -3); } -void LogLuaPushTableKeyValueArray(lua_State *luastate, const char *key, const uint8_t *value, size_t len) +void LuaPushTableKeyValueArray(lua_State *luastate, const char *key, const uint8_t *value, size_t len) { lua_pushstring(luastate, key); LuaPushStringBuffer(luastate, value, len); @@ -693,7 +693,7 @@ static int LuaCallbackThreadInfo(lua_State *luastate) return LuaCallbackThreadInfoPushToStackFromThreadVars(luastate, tv); } -int LogLuaRegisterFunctions(lua_State *luastate) +int LuaRegisterFunctions(lua_State *luastate) { /* registration of the callbacks */ lua_pushcfunction(luastate, LuaCallbackPacketPayload); diff --git a/src/output-lua-common.h b/src/output-lua-common.h index c19045c93d..c5b5423f6e 100644 --- a/src/output-lua-common.h +++ b/src/output-lua-common.h @@ -29,11 +29,11 @@ int LuaCallbackError(lua_State *luastate, const char *msg); const char *LuaGetStringArgument(lua_State *luastate, int argc); -void LogLuaPushTableKeyValueInt(lua_State *luastate, const char *key, int value); -void LogLuaPushTableKeyValueString(lua_State *luastate, const char *key, const char *value); -void LogLuaPushTableKeyValueArray(lua_State *luastate, const char *key, const uint8_t *value, size_t len); +void LuaPushTableKeyValueInt(lua_State *luastate, const char *key, int value); +void LuaPushTableKeyValueString(lua_State *luastate, const char *key, const char *value); +void LuaPushTableKeyValueArray(lua_State *luastate, const char *key, const uint8_t *value, size_t len); -int LogLuaRegisterFunctions(lua_State *luastate); +int LuaRegisterFunctions(lua_State *luastate); #endif /* HAVE_LUA */ diff --git a/src/output-lua.c b/src/output-lua.c index 76b89ce3f2..3d3726cbb0 100644 --- a/src/output-lua.c +++ b/src/output-lua.c @@ -93,7 +93,7 @@ static int LuaTxLogger(ThreadVars *tv, void *thread_data, const Packet *p, Flow /* prepare data to pass to script */ lua_getglobal(td->lua_ctx->luastate, "log"); lua_newtable(td->lua_ctx->luastate); - LogLuaPushTableKeyValueInt(td->lua_ctx->luastate, "tx_id", (int)(tx_id)); + LuaPushTableKeyValueInt(td->lua_ctx->luastate, "tx_id", (int)(tx_id)); int retval = lua_pcall(td->lua_ctx->luastate, 1, 0, 0); if (retval != 0) { @@ -140,7 +140,7 @@ static int LuaStreamingLogger(ThreadVars *tv, void *thread_data, const Flow *f, lua_newtable(td->lua_ctx->luastate); if (flags & OUTPUT_STREAMING_FLAG_TRANSACTION) - LogLuaPushTableKeyValueInt(td->lua_ctx->luastate, "tx_id", (int)(tx_id)); + LuaPushTableKeyValueInt(td->lua_ctx->luastate, "tx_id", (int)(tx_id)); int retval = lua_pcall(td->lua_ctx->luastate, 1, 0, 0); if (retval != 0) { @@ -543,7 +543,7 @@ static lua_State *LuaScriptSetup(const char *filename) lua_getglobal(luastate, "setup"); /* register functions common to all */ - LogLuaRegisterFunctions(luastate); + LuaRegisterFunctions(luastate); /* unconditionally register http function. They will only work * if the tx is registered in the state at runtime though. */ LuaRegisterHttpFunctions(luastate);