From 07cfc5aee4b5de0368ea9d949d47a40ac4fdd5f1 Mon Sep 17 00:00:00 2001 From: batrick Date: Tue, 10 Mar 2009 05:56:10 +0000 Subject: [PATCH] Corrected many #includes for header files (where they are included). Moved the includes for Lua headers to the .cc files so they are not needlessly, repeatedly included. Similarly, moved some standard headers to the .cc files and reorganized includes to be uniform for all nse_* source files. Fixed whitespace (removed tabs). --- nse_binlib.cc | 8 ++++---- nse_bit.cc | 5 +++++ nse_bit.h | 6 ------ nse_debug.cc | 6 ++++++ nse_debug.h | 6 ------ nse_fs.cc | 10 ++++++++++ nse_fs.h | 10 ---------- nse_init.cc | 11 +++++++++++ nse_init.h | 10 ---------- nse_main.cc | 1 + nse_main.h | 11 +++++------ nse_nmaplib.cc | 6 ++++++ nse_nmaplib.h | 6 ------ nse_nsock.cc | 19 +++++++++++-------- nse_nsock.h | 6 ------ nse_openssl.cc | 7 +++++-- nse_openssl.h | 5 ----- nse_pcrelib.cc | 4 ++-- 18 files changed, 66 insertions(+), 71 deletions(-) diff --git a/nse_binlib.cc b/nse_binlib.cc index c294949b80..aaccab7fe4 100644 --- a/nse_binlib.cc +++ b/nse_binlib.cc @@ -41,12 +41,12 @@ #include #include +#include + extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" + #include "lua.h" + #include "lauxlib.h" } -#include #include "nse_binlib.h" static void badcode(lua_State *L, int c) diff --git a/nse_bit.cc b/nse_bit.cc index b143016a92..740befa904 100644 --- a/nse_bit.cc +++ b/nse_bit.cc @@ -8,6 +8,11 @@ * the most recent copy can be found at http://rrt.sc3d.org/Software/Lua/ **/ +extern "C" { + #include "lauxlib.h" + #include "lua.h" +} + #include "nse_bit.h" typedef long long Integer; diff --git a/nse_bit.h b/nse_bit.h index 3a0c240b61..c4dab27978 100644 --- a/nse_bit.h +++ b/nse_bit.h @@ -3,12 +3,6 @@ #define BITLIBNAME "bit" -extern "C" { -#include "lauxlib.h" -#include "lua.h" -} - LUALIB_API int luaopen_bit(lua_State *L); #endif - diff --git a/nse_debug.cc b/nse_debug.cc index ad715fa566..8b43aed558 100644 --- a/nse_debug.cc +++ b/nse_debug.cc @@ -1,3 +1,9 @@ + +extern "C" { + #include "lua.h" + #include "lauxlib.h" +} + #include "nse_debug.h" #include "output.h" diff --git a/nse_debug.h b/nse_debug.h index da6c2b4d31..c425045a98 100644 --- a/nse_debug.h +++ b/nse_debug.h @@ -1,12 +1,6 @@ #ifndef NSE_DEBUG #define NSE_DEBUG -extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" -} - void value_dump(lua_State *L, int i, int depth_limit); void stack_dump(lua_State *L); void lua_state_dump(lua_State *L); diff --git a/nse_fs.cc b/nse_fs.cc index 75a2d824bf..3ebcf1edb3 100644 --- a/nse_fs.cc +++ b/nse_fs.cc @@ -1,3 +1,13 @@ + +extern "C" { + #include "lua.h" + #include "lauxlib.h" +} + +#include +#include +#include + #ifndef WIN32 #include "dirent.h" #endif diff --git a/nse_fs.h b/nse_fs.h index 204c04d45a..9a7c3d373b 100644 --- a/nse_fs.h +++ b/nse_fs.h @@ -1,16 +1,6 @@ #ifndef NSE_FS #define NSE_FS -extern "C" { - #include "lua.h" - #include "lualib.h" - #include "lauxlib.h" -} - -#include -#include -#include - int nse_check_extension (const char* ext, const char* path); int nse_fetchfile(char *path, size_t path_len, const char *file); diff --git a/nse_init.cc b/nse_init.cc index 75be8c8518..553af3b05e 100644 --- a/nse_init.cc +++ b/nse_init.cc @@ -1,3 +1,14 @@ + +extern "C" { + #include "lua.h" + #include "lauxlib.h" + #include "lualib.h" /* for libraries */ +} + +#include +#include +#include + #include "nse_init.h" #include "nse_nmaplib.h" #include "nse_macros.h" diff --git a/nse_init.h b/nse_init.h index ac9f52dcf6..3eefe4fd32 100644 --- a/nse_init.h +++ b/nse_init.h @@ -1,16 +1,6 @@ #ifndef NSE_INIT #define NSE_INIT -extern "C" { - #include "lua.h" - #include "lualib.h" - #include "lauxlib.h" -} - -#include -#include -#include - // initialize the lua state // opens the standard libraries and the nmap lua library int init_lua(lua_State* L); diff --git a/nse_main.cc b/nse_main.cc index 45f919b7ae..01e21566ee 100644 --- a/nse_main.cc +++ b/nse_main.cc @@ -1,3 +1,4 @@ + #include "nse_main.h" #include "nse_init.h" diff --git a/nse_main.h b/nse_main.h index 58cfbb3e05..11387026c3 100644 --- a/nse_main.h +++ b/nse_main.h @@ -1,18 +1,17 @@ #ifndef NMAP_LUA_H #define NMAP_LUA_H -extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" -} - #include #include #include #include #include +extern "C" { + #include "lua.h" + #include "lauxlib.h" +} + class ScriptResult { private: diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc index 35d4b5d963..144b64348b 100644 --- a/nse_nmaplib.cc +++ b/nse_nmaplib.cc @@ -1,3 +1,9 @@ + +extern "C" { + #include "lua.h" + #include "lauxlib.h" +} + #include #include "nmap.h" diff --git a/nse_nmaplib.h b/nse_nmaplib.h index 39d991630e..cc83e217d7 100644 --- a/nse_nmaplib.h +++ b/nse_nmaplib.h @@ -1,12 +1,6 @@ #ifndef NSE_NMAPLIB #define NSE_NMAPLIB -extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" -} - class Target; class Port; diff --git a/nse_nsock.cc b/nse_nsock.cc index 7ab69a42ca..8fd53954c9 100644 --- a/nse_nsock.cc +++ b/nse_nsock.cc @@ -1,12 +1,8 @@ -#include "nse_nsock.h" -#include "nse_macros.h" - -#include "nse_debug.h" -#include "nsock.h" -#include "nmap_error.h" -/* #include "osscan.h" */ -#include "NmapOps.h" +extern "C" { + #include "lua.h" + #include "lauxlib.h" +} #include #include @@ -14,6 +10,13 @@ #include #include +#include "nse_nsock.h" +#include "nse_macros.h" +#include "nse_debug.h" + +#include "nsock.h" +#include "nmap_error.h" +#include "NmapOps.h" #include "utils.h" #include "tcpip.h" diff --git a/nse_nsock.h b/nse_nsock.h index 7ab3718a93..684ee6d650 100644 --- a/nse_nsock.h +++ b/nse_nsock.h @@ -1,12 +1,6 @@ #ifndef NMAP_LUA_NSOCK_H #define NMAP_LUA_NSOCK_H -extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" -} - int luaopen_nsock(lua_State *); int l_nsock_new(lua_State *); int l_nsock_loop(int tout); diff --git a/nse_openssl.cc b/nse_openssl.cc index a51fbb212f..2b267cab31 100644 --- a/nse_openssl.cc +++ b/nse_openssl.cc @@ -18,9 +18,12 @@ #include #include +extern "C" { + #include "lua.h" + #include "lauxlib.h" +} + #include "nse_openssl.h" -#include "lua.h" -#include "lauxlib.h" typedef struct bignum_data { BIGNUM * bn; diff --git a/nse_openssl.h b/nse_openssl.h index a0c3df5c17..634befd6b0 100644 --- a/nse_openssl.h +++ b/nse_openssl.h @@ -3,11 +3,6 @@ #define OPENSSLLIBNAME "openssl" -extern "C" { -#include "lua.h" -#include "lauxlib.h" -} - LUALIB_API int luaopen_openssl(lua_State *L); #endif diff --git a/nse_pcrelib.cc b/nse_pcrelib.cc index 87cac63a0f..aca9ca86f4 100644 --- a/nse_pcrelib.cc +++ b/nse_pcrelib.cc @@ -8,8 +8,8 @@ #include extern "C" { -#include "lua.h" -#include "lauxlib.h" + #include "lua.h" + #include "lauxlib.h" } #include