Corrected many #includes for header files (where they are included).

batrick · batrick · commit 07cfc5aee4b5 · 2009-03-10T05:56:10.000Z
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).
diff --git a/nse_binlib.cc b/nse_binlib.cc
@@ -41,12 +41,12 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <nbase.h>
+
 extern "C" {
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
+  #include "lua.h"
+  #include "lauxlib.h"
 }
-#include <nbase.h>
 #include "nse_binlib.h"
 
 static void badcode(lua_State *L, int c)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,13 @@
+
+extern "C" {
+  #include "lua.h"
+  #include "lauxlib.h"
+}
+
+#include <vector>
+#include <string>
+#include <string.h>
+
 #ifndef WIN32
 #include "dirent.h"
 #endif
diff --git 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 <vector>
-#include <string>
-#include <string.h>
-
 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
@@ -1,3 +1,14 @@
+
+extern "C" {
+  #include "lua.h"
+  #include "lauxlib.h"
+  #include "lualib.h" /* for libraries */
+}
+
+#include <vector>
+#include <string>
+#include <string.h>
+
 #include "nse_init.h"
 #include "nse_nmaplib.h"
 #include "nse_macros.h"
diff --git 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 <vector>
-#include <string>
-#include <string.h>
-
 // 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
@@ -1,3 +1,4 @@
+
 #include "nse_main.h"
 
 #include "nse_init.h"
diff --git 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 <vector>
 #include <list>
 #include <string>
 #include <string.h>
 #include <iostream>
 
+extern "C" {
+  #include "lua.h"
+  #include "lauxlib.h"
+}
+
 class ScriptResult
 {
   private:
diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc
@@ -1,3 +1,9 @@
+
+extern "C" {
+  #include "lua.h"
+  #include "lauxlib.h"
+}
+
 #include <math.h>
 
 #include "nmap.h"
diff --git 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
@@ -1,19 +1,22 @@
-#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 <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sstream>
 #include <iomanip>
 
+#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
@@ -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
@@ -18,9 +18,12 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 
+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
@@ -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
@@ -8,8 +8,8 @@
 #include <string.h>
 
 extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
+  #include "lua.h"
+  #include "lauxlib.h"
 }
 
 #include <locale.h>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`#include "nse_main.h"`
`2`	`3`
`3`	`4`	`#include "nse_init.h"`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`#include <string.h>`
`9`	`9`
`10`	`10`	`extern "C" {`
`11`		`-#include "lua.h"`
`12`		`-#include "lauxlib.h"`
	`11`	`+ #include "lua.h"`
	`12`	`+ #include "lauxlib.h"`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`#include <locale.h>`