From: Victor Julien <victor@inliniac.net>
Date: Tue, 5 Aug 2014 07:58:48 +0000 (+0200)
Subject: lua: move lua output code to generic lua file
X-Git-Tag: suricata-2.1beta2~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a11478715019b07fc2c46e0fd5956298efbca74d;p=thirdparty%2Fsuricata.git

lua: move lua output code to generic lua file

So that other Lua scripts (detect) can also start using it.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 2e126f5616..1bc2d8d9ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -227,7 +227,6 @@ output-json-http.c output-json-http.h \
 output-json-ssh.c output-json-ssh.h \
 output-json-tls.c output-json-tls.h \
 output-lua.c output-lua.h \
-output-lua-common.c output-lua-common.h \
 output-packet.c output-packet.h \
 output-streaming.c output-streaming.h \
 output-tx.c output-tx.h \
@@ -320,6 +319,7 @@ util-ip.h util-ip.c \
 util-logopenfile.h util-logopenfile.c \
 util-logopenfile-tile.h util-logopenfile-tile.c \
 util-lua.c util-lua.h \
+util-lua-common.c util-lua-common.h \
 util-lua-http.c util-lua-http.h \
 util-magic.c util-magic.h \
 util-memcmp.c util-memcmp.h \
diff --git a/src/output-lua.c b/src/output-lua.c
index 3d3726cbb0..9e6dd9e450 100644
--- a/src/output-lua.c
+++ b/src/output-lua.c
@@ -54,7 +54,7 @@
 #include <lauxlib.h>
 
 #include "util-lua.h"
-#include "output-lua-common.h"
+#include "util-lua-common.h"
 #include "util-lua-http.h"
 
 #define MODULE_NAME "LuaLog"
diff --git a/src/output-lua-common.c b/src/util-lua-common.c
similarity index 100%
rename from src/output-lua-common.c
rename to src/util-lua-common.c
diff --git a/src/output-lua-common.h b/src/util-lua-common.h
similarity index 92%
rename from src/output-lua-common.h
rename to src/util-lua-common.h
index c5b5423f6e..fe048fe68e 100644
--- a/src/output-lua-common.h
+++ b/src/util-lua-common.h
@@ -21,8 +21,8 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#ifndef __OUTPUT_LUA_COMMON_H__
-#define __OUTPUT_LUA_COMMON_H__
+#ifndef __UTIL_LUA_COMMON_H__
+#define __UTIL_LUA_COMMON_H__
 
 #ifdef HAVE_LUA
 
@@ -37,4 +37,4 @@ int LuaRegisterFunctions(lua_State *luastate);
 
 #endif /* HAVE_LUA */
 
-#endif /* __OUTPUT_LUA_COMMON_H__ */
+#endif /* __UTIL_LUA_COMMON_H__ */
diff --git a/src/util-lua-http.c b/src/util-lua-http.c
index 2405fa2358..e5957afdd4 100644
--- a/src/util-lua-http.c
+++ b/src/util-lua-http.c
@@ -54,7 +54,7 @@
 #include <lauxlib.h>
 
 #include "util-lua.h"
-#include "output-lua-common.h"
+#include "util-lua-common.h"
 
 int LuaStateNeedProto(lua_State *luastate, AppProto alproto)
 {