From: Mikhail Galanin <mgalanin@mimecast.com>
Date: Fri, 17 Aug 2018 15:45:12 +0000 (+0100)
Subject: [Minor] Better naming: lua_rspamd_dns -> lua_dns
X-Git-Tag: 1.8.0~234^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b5ba9b74e772d9de998350c03e10fb621dc7a3e;p=thirdparty%2Frspamd.git

[Minor] Better naming: lua_rspamd_dns -> lua_dns
---

diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt
index 98a8203c31..0d22027ce1 100644
--- a/src/lua/CMakeLists.txt
+++ b/src/lua/CMakeLists.txt
@@ -27,6 +27,6 @@ SET(LUASRC			  ${CMAKE_CURRENT_SOURCE_DIR}/lua_common.c
 					  ${CMAKE_CURRENT_SOURCE_DIR}/lua_cryptobox.c
 					  ${CMAKE_CURRENT_SOURCE_DIR}/lua_map.c
 					  ${CMAKE_CURRENT_SOURCE_DIR}/lua_thread_pool.c
-					  ${CMAKE_CURRENT_SOURCE_DIR}/lua_rspamd_dns.c)
+					  ${CMAKE_CURRENT_SOURCE_DIR}/lua_dns.c)
 
 SET(RSPAMD_LUA ${LUASRC} PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
index d926fa32e0..f446ec9e80 100644
--- a/src/lua/lua_common.c
+++ b/src/lua/lua_common.c
@@ -740,7 +740,7 @@ rspamd_lua_init ()
 	luaopen_fann (L);
 	luaopen_sqlite3 (L);
 	luaopen_cryptobox (L);
-	luaopen_rspamd_dns (L);
+	luaopen_dns (L);
 
 	luaL_newmetatable (L, "rspamd{ev_base}");
 	lua_pushstring (L, "class");
diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index e6ba4af835..0a9527bb0e 100644
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -280,7 +280,7 @@ void luaopen_html (lua_State * L);
 void luaopen_fann (lua_State *L);
 void luaopen_sqlite3 (lua_State *L);
 void luaopen_cryptobox (lua_State *L);
-void luaopen_rspamd_dns (lua_State *L);
+void luaopen_dns (lua_State *L);
 
 void rspamd_lua_dostring (const gchar *line);
 
diff --git a/src/lua/lua_rspamd_dns.c b/src/lua/lua_dns.c
similarity index 91%
rename from src/lua/lua_rspamd_dns.c
rename to src/lua/lua_dns.c
index 3fee5bb7f8..0d12a137cd 100644
--- a/src/lua/lua_rspamd_dns.c
+++ b/src/lua/lua_dns.c
@@ -24,7 +24,7 @@ static const struct luaL_reg dns_f[] = {
 };
 
 void
-lua_rspamd_dns_callback (struct rdns_reply *reply, void *arg);
+lua_dns_callback (struct rdns_reply *reply, void *arg);
 
 struct lua_rspamd_dns_cbdata {
 	struct thread_entry *thread;
@@ -99,14 +99,14 @@ lua_dns_request (lua_State *L)
 
 	if (forced) {
 		ret = make_dns_request_task_forced (task,
-											lua_rspamd_dns_callback,
+											lua_dns_callback,
 											cbdata,
 											type,
 											to_resolve);
 	}
 	else {
 		ret = make_dns_request_task (task,
-									 lua_rspamd_dns_callback,
+									 lua_dns_callback,
 									 cbdata,
 									 type,
 									 to_resolve);
@@ -126,7 +126,7 @@ lua_dns_request (lua_State *L)
 }
 
 void
-lua_rspamd_dns_callback (struct rdns_reply *reply, void *arg)
+lua_dns_callback (struct rdns_reply *reply, void *arg)
 {
 	struct lua_rspamd_dns_cbdata *cbdata = arg;
 	lua_State *L = cbdata->thread->lua_state;
@@ -155,7 +155,7 @@ lua_rspamd_dns_callback (struct rdns_reply *reply, void *arg)
 }
 
 static gint
-lua_load_rspamd_dns (lua_State * L)
+lua_load_dns (lua_State *L)
 {
 	lua_newtable (L);
 	luaL_register (L, NULL, dns_f);
@@ -164,7 +164,7 @@ lua_load_rspamd_dns (lua_State * L)
 }
 
 void
-luaopen_rspamd_dns (lua_State * L)
+luaopen_dns (lua_State *L)
 {
-	rspamd_lua_add_preload (L, "rspamd_dns", lua_load_rspamd_dns);
+	rspamd_lua_add_preload (L, "rspamd_dns", lua_load_dns);
 }