From 421176fc00e6b6a8b2eaba4d01236ad6d111bac4 Mon Sep 17 00:00:00 2001 From: d33tah Date: Wed, 18 Jun 2014 11:30:02 +0000 Subject: [PATCH] Get rid of double newline at the EOF I accidentally introduced in the last commit. --- FPEngine.cc | 1 - FPModel.cc | 1 - FingerPrintResults.cc | 1 - MACLookup.cc | 1 - NmapOps.cc | 1 - NmapOutputTable.cc | 1 - Target.cc | 1 - TargetGroup.cc | 1 - charpool.cc | 1 - idle_scan.cc | 1 - main.cc | 1 - nmap-header-template.cc | 1 - nmap.cc | 1 - nmap_dns.cc | 1 - nmap_error.cc | 1 - nmap_ftp.cc | 1 - nmap_tty.cc | 1 - nse_binlib.cc | 1 - nse_bit.cc | 1 - nse_debug.cc | 1 - nse_dnet.cc | 1 - nse_fs.cc | 1 - nse_main.cc | 1 - nse_nmaplib.cc | 1 - nse_nsock.cc | 1 - nse_openssl.cc | 1 - nse_pcrelib.cc | 1 - nse_ssl_cert.cc | 1 - nse_utility.cc | 1 - osscan.cc | 1 - osscan2.cc | 1 - output.cc | 1 - payload.cc | 1 - portlist.cc | 1 - portreasons.cc | 1 - protocols.cc | 1 - scan_engine.cc | 1 - service_scan.cc | 1 - services.cc | 1 - targets.cc | 1 - tcpip.cc | 1 - timing.cc | 1 - traceroute.cc | 1 - utils.cc | 1 - xml.cc | 1 - 45 files changed, 45 deletions(-) diff --git a/FPEngine.cc b/FPEngine.cc index 97042d928b..da1651473a 100644 --- a/FPEngine.cc +++ b/FPEngine.cc @@ -2691,4 +2691,3 @@ 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/FPModel.cc b/FPModel.cc index 6ed3b0f1f6..e84fff51ad 100644 --- a/FPModel.cc +++ b/FPModel.cc @@ -3337,4 +3337,3 @@ std::vector load_fp_matches() { } return matches; } - diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc index c2ab46ea27..5f8b0f596a 100644 --- a/FingerPrintResults.cc +++ b/FingerPrintResults.cc @@ -330,4 +330,3 @@ bool FingerPrintResults::classAlreadyExistsInResults(struct OS_Classification *O // Went through all the results -- no duplicates found return false; } - diff --git a/MACLookup.cc b/MACLookup.cc index ea30ca58c1..388c1e3910 100644 --- a/MACLookup.cc +++ b/MACLookup.cc @@ -246,4 +246,3 @@ bool MACCorp2Prefix(const char *vendorstr, u8 *mac_data) { } return false; } - diff --git a/NmapOps.cc b/NmapOps.cc index caf4b1b6a0..24fc1d0fb2 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -688,4 +688,3 @@ void NmapOps::chooseScripts(char* argument) { } } #endif - diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc index 70b0aeaee2..9469ba1d9d 100644 --- a/NmapOutputTable.cc +++ b/NmapOutputTable.cc @@ -319,4 +319,3 @@ char *NmapOutputTable::printableTable(int *size) { if (size) *size = p; return tableout; } - diff --git a/Target.cc b/Target.cc index 9de524a03d..fb60ff0b5b 100644 --- a/Target.cc +++ b/Target.cc @@ -576,4 +576,3 @@ void Target::osscanSetFlag(int flag) { osscan_flag = flag; } - diff --git a/TargetGroup.cc b/TargetGroup.cc index 835e85ebd4..5f3f02a1f9 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -785,4 +785,3 @@ unsigned long NewTargets::insert (const char *target) { return new_targets->push(target); } - diff --git a/charpool.cc b/charpool.cc index d8ab1b271f..87532d9419 100644 --- a/charpool.cc +++ b/charpool.cc @@ -225,4 +225,3 @@ int modulus; return cp_strdup(src); } - diff --git a/idle_scan.cc b/idle_scan.cc index f7ea0161bd..ce67ef6510 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -1460,4 +1460,3 @@ void idle_scan(Target *target, u16 *portarray, int numports, target->stopTimeOutClock(NULL); return; } - diff --git a/main.cc b/main.cc index 417df2143e..09ec826213 100644 --- a/main.cc +++ b/main.cc @@ -228,4 +228,3 @@ int main(int argc, char *argv[]) { return nmap_main(argc, argv); } - diff --git a/nmap-header-template.cc b/nmap-header-template.cc index e87415bebd..204be15fb7 100644 --- a/nmap-header-template.cc +++ b/nmap-header-template.cc @@ -122,4 +122,3 @@ ***************************************************************************/ /* $Id$ */ - diff --git a/nmap.cc b/nmap.cc index 3e2a0121bb..74ec06bd0b 100644 --- a/nmap.cc +++ b/nmap.cc @@ -3131,4 +3131,3 @@ 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_dns.cc b/nmap_dns.cc index fc40952044..def54781ad 100644 --- a/nmap_dns.cc +++ b/nmap_dns.cc @@ -1389,4 +1389,3 @@ std::list get_dns_servers() { } return serverList; } - diff --git a/nmap_error.cc b/nmap_error.cc index b172a5ff94..d1a6c3d9f9 100644 --- a/nmap_error.cc +++ b/nmap_error.cc @@ -286,4 +286,3 @@ void gh_perror(const char *fmt, ...) { fflush(stderr); return; } - diff --git a/nmap_ftp.cc b/nmap_ftp.cc index 1dc05fcdb6..942251e2a5 100644 --- a/nmap_ftp.cc +++ b/nmap_ftp.cc @@ -382,4 +382,3 @@ void bounce_scan(Target *target, u16 *portarray, int numports, numports, (long) time(NULL) - starttime); return; } - diff --git a/nmap_tty.cc b/nmap_tty.cc index 57f85f76ad..463b3645f7 100644 --- a/nmap_tty.cc +++ b/nmap_tty.cc @@ -374,4 +374,3 @@ bool keyWasPressed() return false; } - diff --git a/nse_binlib.cc b/nse_binlib.cc index 0a1273c784..a1d3def124 100644 --- a/nse_binlib.cc +++ b/nse_binlib.cc @@ -411,4 +411,3 @@ LUALIB_API int luaopen_binlib (lua_State *L) { luaL_newlib(L, binlib); return 1; } - diff --git a/nse_bit.cc b/nse_bit.cc index 7dd3281b6b..9afbc6fbc2 100644 --- a/nse_bit.cc +++ b/nse_bit.cc @@ -72,4 +72,3 @@ LUALIB_API int luaopen_bit(lua_State *L) { luaL_newlib(L, bitlib); return 1; } - diff --git a/nse_debug.cc b/nse_debug.cc index 60b62fea9a..f15f88fdce 100644 --- a/nse_debug.cc +++ b/nse_debug.cc @@ -100,4 +100,3 @@ void lua_state_dump (lua_State *L) assert(lua_gettop(L) == top); } - diff --git a/nse_dnet.cc b/nse_dnet.cc index dd8ab4b544..23a60a2e03 100644 --- a/nse_dnet.cc +++ b/nse_dnet.cc @@ -366,4 +366,3 @@ LUALIB_API int luaopen_dnet (lua_State *L) return 1; } - diff --git a/nse_fs.cc b/nse_fs.cc index f452b7a199..8af24a6ae0 100644 --- a/nse_fs.cc +++ b/nse_fs.cc @@ -320,4 +320,3 @@ LUALIB_API int luaopen_lfs(lua_State *L) { set_info (L); return 1; } - diff --git a/nse_main.cc b/nse_main.cc index 1367fc3169..362d1675d7 100644 --- a/nse_main.cc +++ b/nse_main.cc @@ -816,4 +816,3 @@ void close_nse (void) L_NSE = NULL; } } - diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc index 9ffc33df86..0fe22144c6 100644 --- a/nse_nmaplib.cc +++ b/nse_nmaplib.cc @@ -972,4 +972,3 @@ int luaopen_nmap (lua_State *L) return 1; } - diff --git a/nse_nsock.cc b/nse_nsock.cc index 32b154bb3f..87772a6174 100644 --- a/nse_nsock.cc +++ b/nse_nsock.cc @@ -1102,4 +1102,3 @@ LUALIB_API int luaopen_nsock (lua_State *L) return 1; } - diff --git a/nse_openssl.cc b/nse_openssl.cc index 7efeac8088..66a8e55302 100644 --- a/nse_openssl.cc +++ b/nse_openssl.cc @@ -572,4 +572,3 @@ LUALIB_API int luaopen_openssl(lua_State *L) { return 1; } - diff --git a/nse_pcrelib.cc b/nse_pcrelib.cc index 669c0d4caa..80a536cd9e 100644 --- a/nse_pcrelib.cc +++ b/nse_pcrelib.cc @@ -402,4 +402,3 @@ LUALIB_API int luaopen_pcrelib(lua_State *L) return 1; } - diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc index f2eb57bfd3..86f58bf144 100644 --- a/nse_ssl_cert.cc +++ b/nse_ssl_cert.cc @@ -530,4 +530,3 @@ 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_utility.cc b/nse_utility.cc index d320a8eb11..9ce7c574f9 100644 --- a/nse_utility.cc +++ b/nse_utility.cc @@ -203,4 +203,3 @@ Port *nseU_getport (lua_State *L, Target *target, Port *port, int idx) lua_pop(L, 2); return p; } - diff --git a/osscan.cc b/osscan.cc index 13caed8faf..7b414f0b62 100644 --- a/osscan.cc +++ b/osscan.cc @@ -1301,4 +1301,3 @@ FingerPrintDB *parse_fingerprint_reference_file(const char *dbname) { return parse_fingerprint_file(filename); } - diff --git a/osscan2.cc b/osscan2.cc index aa4d3a75b6..732d24f222 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -3726,4 +3726,3 @@ int OSScan::os_scan(std::vector &Targets) { else return OP_FAILURE; } - diff --git a/output.cc b/output.cc index 66b0ec18e9..e92fed0587 100644 --- a/output.cc +++ b/output.cc @@ -2683,4 +2683,3 @@ void nmap_nsock_stderr_logger(nsock_pool nsp, const struct nsock_log_rec *rec) { log_write(LOG_STDERR, "NSOCK %s [%.4fs] %s(): %s\n", nslog2str(rec->level), elapsed_time/1000.0, rec->func, rec->msg); } - diff --git a/payload.cc b/payload.cc index b4110ec326..3710cdb47c 100644 --- a/payload.cc +++ b/payload.cc @@ -419,4 +419,3 @@ const char *get_udp_payload(u16 dport, size_t *length) { return udp_port2payload(dport, length); } } - diff --git a/portlist.cc b/portlist.cc index 19f72d6ec5..999d3f1aef 100644 --- a/portlist.cc +++ b/portlist.cc @@ -943,4 +943,3 @@ void random_port_cheat(u16 *ports, int portcount) { } } } - diff --git a/portreasons.cc b/portreasons.cc index fd607e5106..aad2fe0e69 100644 --- a/portreasons.cc +++ b/portreasons.cc @@ -562,4 +562,3 @@ char *port_reason_str(state_reason_t r) { } return reason; } - diff --git a/protocols.cc b/protocols.cc index c71e9d78d5..a7b191091c 100644 --- a/protocols.cc +++ b/protocols.cc @@ -250,4 +250,3 @@ struct protoent *nmap_getprotbynum(int num) { /* Couldn't find it ... oh well. */ return NULL; } - diff --git a/scan_engine.cc b/scan_engine.cc index e50bcc51d0..3120319ae8 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -5864,4 +5864,3 @@ void ultra_scan(std::vector &Targets, struct scan_lists *ports, if (o.debugging > 2 && USI.pd != NULL) pcap_print_stats(LOG_PLAIN, USI.pd); } - diff --git a/service_scan.cc b/service_scan.cc index 9e3a8eb564..970dac3256 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -2760,4 +2760,3 @@ int service_scan(std::vector &Targets) { return 0; } - diff --git a/services.cc b/services.cc index 391e267aab..010514d2a7 100644 --- a/services.cc +++ b/services.cc @@ -566,4 +566,3 @@ void gettoppts(double level, char *portlist, struct scan_lists * ports) { else if (o.debugging && level >= 1) log_write(LOG_STDOUT, "PORTS: Using top %d ports found open (TCP:%d, UDP:%d, SCTP:%d)\n", (int) level, ports->tcp_count, ports->udp_count, ports->sctp_count); } - diff --git a/targets.cc b/targets.cc index d495b3e3f0..b6acc5a2f1 100644 --- a/targets.cc +++ b/targets.cc @@ -721,4 +721,3 @@ Target *nexthost(HostGroupState *hs, const addrset *exclude_group, return hs->hostbatch[hs->next_batch_no++]; } - diff --git a/tcpip.cc b/tcpip.cc index 15d6c23aec..218dbd12c4 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -2170,4 +2170,3 @@ int gettcpopt_ts(struct tcp_hdr *tcp, u32 *timestamp, u32 *echots) { *echots = 0; return 0; } - diff --git a/timing.cc b/timing.cc index a249f5ce63..dc87d82266 100644 --- a/timing.cc +++ b/timing.cc @@ -774,4 +774,3 @@ 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 index a2fc0a0079..e7507b8033 100644 --- a/traceroute.cc +++ b/traceroute.cc @@ -1649,4 +1649,3 @@ 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/utils.cc b/utils.cc index f17249dd86..56a0c09b33 100644 --- a/utils.cc +++ b/utils.cc @@ -700,4 +700,3 @@ int win32_munmap(char *filestr, int filelen) { return 0; } #endif - diff --git a/xml.cc b/xml.cc index 32e3dff543..26c9725f48 100644 --- a/xml.cc +++ b/xml.cc @@ -452,4 +452,3 @@ bool xml_tag_open() { bool xml_root_written() { return xml.root_written; } -