mirror of
https://github.com/nmap/nmap.git
synced 2025-12-31 20:09:02 +00:00
merge soc07 r4871:4884 and r4888 - renaming __FUNCTION__ to __func__ and changing hardcoded func names to __func__
This commit is contained in:
@@ -274,7 +274,7 @@ int addportsfromservmask(char *mask, u8 *porttbl, struct scan_lists *ports, int
|
||||
int bucket,t=0;
|
||||
|
||||
if (!services_initialized && nmap_services_init() == -1)
|
||||
fatal("addportsfromservmask: Couldn't get port numbers");
|
||||
fatal("%s: Couldn't get port numbers", __func__);
|
||||
|
||||
for(bucket = 0; bucket < SERVICE_TABLE_SIZE; bucket++) {
|
||||
for(current = service_table[bucket % SERVICE_TABLE_SIZE]; current; current = current->next) {
|
||||
@@ -367,7 +367,7 @@ struct scan_lists *gettoppts(double level, char *portlist) {
|
||||
struct service_list *current;
|
||||
|
||||
if (!services_initialized && nmap_services_init() == -1)
|
||||
fatal("gettoppts: Couldn't get port numbers");
|
||||
fatal("%s: Couldn't get port numbers", __func__);
|
||||
|
||||
if (ratio_format == 0) {
|
||||
if (level != -1)
|
||||
|
||||
Reference in New Issue
Block a user