Add newlines at the EOF in conformance to Daniel's coding standards

d33tah · d33tah · commit e3d1c178e3b4 · 2014-06-18T10:18:58.000Z
proposal. This only affects Nmap's root directory. We might also need to
modify the code which autogenerates Nmap's source code files such as IPv6
fingerprinting code.
diff --git a/FPEngine.cc b/FPEngine.cc
@@ -2691,3 +2691,4 @@ void response_reception_handler_wrapper(nsock_pool nsp, nsock_event nse, void *a
   global_netctl.response_reception_handler(nsp, nse, arg);
   return;
 }
+
diff --git a/FPEngine.h b/FPEngine.h
@@ -471,3 +471,4 @@ std::vector<FingerMatch> load_fp_matches();
 
 
 #endif /* __FPENGINE_H__ */
+
diff --git a/FPModel.cc b/FPModel.cc
@@ -3337,3 +3337,4 @@ std::vector<FingerMatch> load_fp_matches() {
 	}
 	return matches;
 }
+
diff --git a/FingerPrintResults.h b/FingerPrintResults.h
@@ -223,3 +223,4 @@ class FingerPrintResultsIPv6 : public FingerPrintResults {
 };
 
 #endif /* FINGERPRINTRESULTS_H */
+
diff --git a/MACLookup.cc b/MACLookup.cc
@@ -246,3 +246,4 @@ bool MACCorp2Prefix(const char *vendorstr, u8 *mac_data) {
   }
   return false;
 }
+
diff --git a/MACLookup.h b/MACLookup.h
@@ -145,3 +145,4 @@ const char *MACPrefix2Corp(const u8 *prefix);
 bool MACCorp2Prefix(const char *vendorstr, u8 *mac_data);
 
 #endif /* MACLOOKUP_H */
+
diff --git a/NmapOps.cc b/NmapOps.cc
@@ -688,3 +688,4 @@ void NmapOps::chooseScripts(char* argument) {
         }
 }
 #endif
+
diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc
@@ -319,3 +319,4 @@ char *NmapOutputTable::printableTable(int *size) {
   if (size) *size = p;
   return tableout;
 }
+
diff --git a/Target.h b/Target.h
@@ -375,3 +375,4 @@ class Target {
 };
 
 #endif /* TARGET_H */
+
diff --git a/TargetGroup.cc b/TargetGroup.cc
@@ -785,3 +785,4 @@ unsigned long NewTargets::insert (const char *target) {
 
   return new_targets->push(target);
 }
+
diff --git a/TargetGroup.h b/TargetGroup.h
@@ -251,3 +251,4 @@ class NewTargets {
 };
 
 #endif /* TARGETGROUP_H */
+
diff --git a/charpool.cc b/charpool.cc
@@ -225,3 +225,4 @@ int modulus;
 
  return cp_strdup(src);
 }
+
diff --git a/charpool.h b/charpool.h
@@ -133,3 +133,4 @@ char *cp_strdup(const char *src);
 void cp_free(void);
 
 #endif
+
diff --git a/global_structures.h b/global_structures.h
@@ -342,3 +342,4 @@ struct scan_lists {
 typedef enum { STYPE_UNKNOWN, HOST_DISCOVERY, ACK_SCAN, SYN_SCAN, FIN_SCAN, XMAS_SCAN, UDP_SCAN, CONNECT_SCAN, NULL_SCAN, WINDOW_SCAN, SCTP_INIT_SCAN, SCTP_COOKIE_ECHO_SCAN, MAIMON_SCAN, IPPROT_SCAN, PING_SCAN, PING_SCAN_ARP, IDLE_SCAN, BOUNCE_SCAN, SERVICE_SCAN, OS_SCAN, SCRIPT_PRE_SCAN, SCRIPT_SCAN, SCRIPT_POST_SCAN, TRACEROUTE, PING_SCAN_ND }stype;
 
 #endif /*GLOBAL_STRUCTURES_H */
+
diff --git a/idle_scan.cc b/idle_scan.cc
@@ -1460,3 +1460,4 @@ void idle_scan(Target *target, u16 *portarray, int numports,
   target->stopTimeOutClock(NULL);
   return;
 }
+
diff --git a/idle_scan.h b/idle_scan.h
@@ -144,3 +144,4 @@ void idle_scan(Target *target, u16 *portarray, int numports,
                char *proxy, const struct scan_lists *ports);
 
 #endif /* IDLE_SCAN_H */
+
diff --git a/main.cc b/main.cc
@@ -228,3 +228,4 @@ int main(int argc, char *argv[]) {
 
   return nmap_main(argc, argv);
 }
+
diff --git a/nmap.cc b/nmap.cc
@@ -3131,3 +3131,4 @@ static void display_nmap_version() {
   log_write(LOG_STDOUT, "\n");
   log_write(LOG_STDOUT, "Available nsock engines: %s\n", nsock_list_engines());
 }
+
diff --git a/nmap.h b/nmap.h
@@ -459,3 +459,4 @@ int nmap_fileexistsandisreadable(const char* pathname);
 int gather_logfile_resumption_state(char *fname, int *myargc, char ***myargv);
 
 #endif /* NMAP_H */
+
diff --git a/nmap_amigaos.h b/nmap_amigaos.h
@@ -173,3 +173,4 @@ struct addrinfo {
 };
 
 #endif /* _NMAP_AMIGAOS_H_ */
+
diff --git a/nmap_dns.cc b/nmap_dns.cc
@@ -1389,3 +1389,4 @@ std::list<std::string> get_dns_servers() {
   }
   return serverList;
 }
+
diff --git a/nmap_dns.h b/nmap_dns.h
@@ -131,3 +131,4 @@ void nmap_mass_rdns(Target ** targets, int num_targets);
 const char *lookup_cached_host(u32 ip);
 
 std::list<std::string> get_dns_servers();
+
diff --git a/nmap_error.cc b/nmap_error.cc
@@ -286,3 +286,4 @@ void gh_perror(const char *fmt, ...) {
   fflush(stderr);
   return;
 }
+
diff --git a/nmap_ftp.cc b/nmap_ftp.cc
@@ -382,3 +382,4 @@ void bounce_scan(Target *target, u16 *portarray, int numports,
               numports, (long) time(NULL) - starttime);
   return;
 }
+
diff --git a/nmap_ftp.h b/nmap_ftp.h
@@ -156,3 +156,4 @@ void bounce_scan(Target *target, u16 *portarray, int numports,
                  struct ftpinfo *ftp);
 
 #endif /* NMAP_FTP_H */
+
diff --git a/nmap_tty.cc b/nmap_tty.cc
@@ -374,3 +374,4 @@ bool keyWasPressed()
 
   return false;
 }
+
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
@@ -144,3 +144,4 @@
 #define PCRE_INCLUDED 1
 
 #endif /* NMAP_WINCONFIG_H */
+
diff --git a/nse_binlib.h b/nse_binlib.h
@@ -6,3 +6,4 @@
 LUALIB_API int luaopen_binlib (lua_State *L);
 
 #endif /* NSE_BINLIB */
+
diff --git a/nse_bit.h b/nse_bit.h
@@ -6,3 +6,4 @@
 LUALIB_API int luaopen_bit(lua_State *L);
 
 #endif
+
diff --git a/nse_debug.cc b/nse_debug.cc
@@ -100,3 +100,4 @@ void lua_state_dump (lua_State *L)
 
   assert(lua_gettop(L) == top);
 }
+
diff --git a/nse_dnet.cc b/nse_dnet.cc
@@ -366,3 +366,4 @@ LUALIB_API int luaopen_dnet (lua_State *L)
 
   return 1;
 }
+
diff --git a/nse_dnet.h b/nse_dnet.h
@@ -4,3 +4,4 @@
 LUALIB_API int luaopen_dnet (lua_State *L);
 
 #endif
+
diff --git a/nse_fs.h b/nse_fs.h
@@ -5,3 +5,4 @@
 LUALIB_API int luaopen_lfs (lua_State *L);
 
 #endif
+
diff --git a/nse_main.cc b/nse_main.cc
@@ -816,3 +816,4 @@ void close_nse (void)
     L_NSE = NULL;
   }
 }
+
diff --git a/nse_main.h b/nse_main.h
@@ -74,3 +74,4 @@ void close_nse (void);
 #define SCRIPT_ENGINE_EXTENSION ".nse"
 
 #endif
+
diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc
@@ -972,3 +972,4 @@ int luaopen_nmap (lua_State *L)
 
   return 1;
 }
+
diff --git a/nse_nsock.cc b/nse_nsock.cc
@@ -1102,3 +1102,4 @@ LUALIB_API int luaopen_nsock (lua_State *L)
 
   return 1;
 }
+
diff --git a/nse_nsock.h b/nse_nsock.h
@@ -6,3 +6,4 @@
 LUALIB_API int luaopen_nsock (lua_State *);
 
 #endif
+
diff --git a/nse_openssl.h b/nse_openssl.h
@@ -6,3 +6,4 @@
 LUALIB_API int luaopen_openssl(lua_State *L);
 
 #endif
+
diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
@@ -530,3 +530,4 @@ void nse_nsock_init_ssl_cert(lua_State *L)
   lua_setfield(L, -2, "__index");
   ssl_cert_methods_index_ref = luaL_ref(L, LUA_REGISTRYINDEX);
 }
+
diff --git a/nse_ssl_cert.h b/nse_ssl_cert.h
@@ -125,3 +125,4 @@
 
 int l_get_ssl_certificate(lua_State *L);
 void nse_nsock_init_ssl_cert(lua_State *L);
+
diff --git a/nse_utility.cc b/nse_utility.cc
@@ -203,3 +203,4 @@ Port *nseU_getport (lua_State *L, Target *target, Port *port, int idx)
   lua_pop(L, 2);
   return p;
 }
+
diff --git a/nse_utility.h b/nse_utility.h
@@ -147,3 +147,4 @@ Target *nseU_gettarget (lua_State *L, int idx);
 Port *nseU_getport (lua_State *L, Target *target, Port *port, int idx);
 
 #endif
+
diff --git a/osscan.cc b/osscan.cc
@@ -1301,3 +1301,4 @@ FingerPrintDB *parse_fingerprint_reference_file(const char *dbname) {
 
   return parse_fingerprint_file(filename);
 }
+
diff --git a/osscan2.cc b/osscan2.cc
@@ -3726,3 +3726,4 @@ int OSScan::os_scan(std::vector<Target *> &Targets) {
   else
     return OP_FAILURE;
 }
+
diff --git a/output.h b/output.h
@@ -290,3 +290,4 @@ void nmap_adjust_loglevel(nsock_pool nsp, bool trace);
 void nmap_nsock_stderr_logger(nsock_pool nsp, const struct nsock_log_rec *rec);
 
 #endif /* OUTPUT_H */
+
diff --git a/payload.cc b/payload.cc
@@ -419,3 +419,4 @@ const char *get_udp_payload(u16 dport, size_t *length) {
     return udp_port2payload(dport, length);
   }
 }
+
diff --git a/payload.h b/payload.h
@@ -133,3 +133,4 @@ const char *udp_port2payload(u16 dport, size_t *length);
 int init_payloads(void);
 
 #endif /* PAYLOAD_H */
+
diff --git a/portlist.h b/portlist.h
@@ -346,3 +346,4 @@ class PortList {
 };
 
 #endif
+
diff --git a/portreasons.cc b/portreasons.cc
@@ -562,3 +562,4 @@ char *port_reason_str(state_reason_t r) {
         }
         return reason;
 }
+
diff --git a/protocols.cc b/protocols.cc
@@ -250,3 +250,4 @@ struct protoent *nmap_getprotbynum(int num) {
   /* Couldn't find it ... oh well. */
   return NULL;
 }
+
diff --git a/protocols.h b/protocols.h
@@ -158,3 +158,4 @@ struct protoent *nmap_getprotbynum(int num);
    "N/A")
 
 #endif
+
diff --git a/scan_engine.cc b/scan_engine.cc
@@ -5864,3 +5864,4 @@ void ultra_scan(std::vector<Target *> &Targets, struct scan_lists *ports,
   if (o.debugging > 2 && USI.pd != NULL)
     pcap_print_stats(LOG_PLAIN, USI.pd);
 }
+
diff --git a/scan_engine.h b/scan_engine.h
@@ -201,3 +201,4 @@ int determineScanGroupSize(int hosts_scanned_so_far,
                            struct scan_lists *ports);
 
 #endif /* SCAN_ENGINE_H */
+
diff --git a/services.h b/services.h
@@ -155,3 +155,4 @@ void gettoppts(double level, char *portlist, struct scan_lists * ports);
 void free_services();
 
 #endif
+
diff --git a/struct_ip.h b/struct_ip.h
@@ -160,3 +160,4 @@ struct icmp
 #define icmp_data       icmp_dun.id_data
 };
 #endif /* HAVE_STRUCT_ICMP */
+
diff --git a/targets.cc b/targets.cc
@@ -721,3 +721,4 @@ Target *nexthost(HostGroupState *hs, const addrset *exclude_group,
 
   return hs->hostbatch[hs->next_batch_no++];
 }
+
diff --git a/targets.h b/targets.h
@@ -235,3 +235,4 @@ int dumpExclude(addrset *exclude_group);
 void returnhost(HostGroupState *hs);
 
 #endif /* TARGETS_H */
+
diff --git a/tcpip.cc b/tcpip.cc
@@ -2170,3 +2170,4 @@ int gettcpopt_ts(struct tcp_hdr *tcp, u32 *timestamp, u32 *echots) {
     *echots = 0;
   return 0;
 }
+
diff --git a/timing.cc b/timing.cc
@@ -774,3 +774,4 @@ bool ScanProgressMeter::beginOrEndTask(const struct timeval *now, const char *ad
   log_flush(LOG_STDOUT|LOG_XML);
   return true;
 }
+
diff --git a/traceroute.cc b/traceroute.cc
@@ -1649,3 +1649,4 @@ static struct timeval get_now(struct timeval *now) {
 static const char *ss_to_string(const struct sockaddr_storage *ss) {
   return inet_ntop_ez(ss, sizeof(*ss));
 }
+
diff --git a/traceroute.h b/traceroute.h
@@ -130,3 +130,4 @@
 int traceroute(std::vector<Target *> &Targets);
 
 void traceroute_hop_cache_clear();
+
diff --git a/utils.cc b/utils.cc
@@ -700,3 +700,4 @@ int win32_munmap(char *filestr, int filelen) {
   return 0;
 }
 #endif
+
diff --git a/utils.h b/utils.h
@@ -229,3 +229,4 @@ int win32_munmap(char *filestr, int filelen);
 #endif /* WIN32 */
 
 #endif /* UTILS_H */
+
diff --git a/xml.cc b/xml.cc
@@ -452,3 +452,4 @@ bool xml_tag_open() {
 bool xml_root_written() {
   return xml.root_written;
 }
+
diff --git a/xml.h b/xml.h
@@ -153,3 +153,4 @@ bool xml_tag_open();
 bool xml_root_written();
 
 #endif
+

Original file line number	Diff line number	Diff line change
`@@ -2691,3 +2691,4 @@ void response_reception_handler_wrapper(nsock_pool nsp, nsock_event nse, void *a`
`2691`	`2691`	`global_netctl.response_reception_handler(nsp, nse, arg);`
`2692`	`2692`	`return;`
`2693`	`2693`	`}`
	`2694`	`+`
Original file line number	Diff line number	Diff line change
`@@ -471,3 +471,4 @@ std::vector<FingerMatch> load_fp_matches();`
`471`	`471`
`472`	`472`
`473`	`473`	`#endif /* __FPENGINE_H__ */`
	`474`	`+`
Original file line number	Diff line number	Diff line change
`@@ -3337,3 +3337,4 @@ std::vector<FingerMatch> load_fp_matches() {`
`3337`	`3337`	`}`
`3338`	`3338`	`return matches;`
`3339`	`3339`	`}`
	`3340`	`+`
Original file line number	Diff line number	Diff line change
`@@ -223,3 +223,4 @@ class FingerPrintResultsIPv6 : public FingerPrintResults {`
`223`	`223`	`};`
`224`	`224`
`225`	`225`	`#endif /* FINGERPRINTRESULTS_H */`
	`226`	`+`
Original file line number	Diff line number	Diff line change
`@@ -246,3 +246,4 @@ bool MACCorp2Prefix(const char vendorstr, u8 mac_data) {`
`246`	`246`	`}`
`247`	`247`	`return false;`
`248`	`248`	`}`
	`249`	`+`
Original file line number	Diff line number	Diff line change
`@@ -145,3 +145,4 @@ const char MACPrefix2Corp(const u8 prefix);`
`145`	`145`	`bool MACCorp2Prefix(const char vendorstr, u8 mac_data);`
`146`	`146`
`147`	`147`	`#endif /* MACLOOKUP_H */`
	`148`	`+`
Original file line number	Diff line number	Diff line change
`@@ -688,3 +688,4 @@ void NmapOps::chooseScripts(char* argument) {`
`688`	`688`	`}`
`689`	`689`	`}`
`690`	`690`	`#endif`
	`691`	`+`
Original file line number	Diff line number	Diff line change
`@@ -319,3 +319,4 @@ char NmapOutputTable::printableTable(int size) {`
`319`	`319`	`if (size) *size = p;`
`320`	`320`	`return tableout;`
`321`	`321`	`}`
	`322`	`+`
Original file line number	Diff line number	Diff line change
`@@ -375,3 +375,4 @@ class Target {`
`375`	`375`	`};`
`376`	`376`
`377`	`377`	`#endif /* TARGET_H */`
	`378`	`+`
Original file line number	Diff line number	Diff line change
`@@ -785,3 +785,4 @@ unsigned long NewTargets::insert (const char *target) {`
`785`	`785`
`786`	`786`	`return new_targets->push(target);`
`787`	`787`	`}`
	`788`	`+`