CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-27 03:48:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use else blocks, rather than separate if blocks, when checking for arguments to

Browse source 
the -P? options to better communicate the intent of the code. Also remove
braces from around some one-line calls to fatal.
This commit is contained in:
david 2008-05-28 15:45:46 +00:00
parent a90ec1ef8a
commit d6b1222295
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
nmap.cc
View file

@ -1039,11 +1039,9 @@ int nmap_main(int argc, char *argv[]) {
o.pingtype |= (PINGTYPE_TCP|PINGTYPE_TCP_USE_SYN);
if (*(optarg + 1) != '\0') {
getpts_simple(optarg + 1, SCAN_TCP_PORT, &o.ping_synprobes, &o.num_ping_synprobes);
if (o.num_ping_synprobes <= 0) {
if (o.num_ping_synprobes <= 0)
fatal("Bogus argument to -PS: %s", optarg + 1);
}
}
if (o.num_ping_synprobes == 0) {
} else {
getpts_simple(DEFAULT_TCP_PROBE_PORT_SPEC, SCAN_TCP_PORT, &o.ping_synprobes, &o.num_ping_synprobes);
assert(o.num_ping_synprobes > 0);
}
@ -1056,11 +1054,9 @@ int nmap_main(int argc, char *argv[]) {
o.pingtype |= (PINGTYPE_TCP|PINGTYPE_TCP_USE_ACK);
if (*(optarg + 1) != '\0') {
getpts_simple(optarg + 1, SCAN_TCP_PORT, &o.ping_ackprobes, &o.num_ping_ackprobes);
if (o.num_ping_ackprobes <= 0) {
if (o.num_ping_ackprobes <= 0)
fatal("Bogus argument to -PA: %s", optarg + 1);
}
}
if (o.num_ping_ackprobes == 0) {
} else {
getpts_simple(DEFAULT_TCP_PROBE_PORT_SPEC, SCAN_TCP_PORT, &o.ping_ackprobes, &o.num_ping_ackprobes);
assert(o.num_ping_ackprobes > 0);
}
@ -1071,11 +1067,9 @@ int nmap_main(int argc, char *argv[]) {
o.pingtype |= (PINGTYPE_UDP);
if (*(optarg + 1) != '\0') {
getpts_simple(optarg + 1, SCAN_UDP_PORT, &o.ping_udpprobes, &o.num_ping_udpprobes);
if (o.num_ping_udpprobes <= 0) {
if (o.num_ping_udpprobes <= 0)
fatal("Bogus argument to -PU: %s", optarg + 1);
}
}
if (o.num_ping_udpprobes == 0) {
} else {
getpts_simple(DEFAULT_UDP_PROBE_PORT_SPEC, SCAN_UDP_PORT, &o.ping_udpprobes, &o.num_ping_udpprobes);
assert(o.num_ping_udpprobes > 0);
}
@ -1086,11 +1080,9 @@ int nmap_main(int argc, char *argv[]) {
o.pingtype = DEFAULT_PING_TYPES;
if (*(optarg + 1) != '\0') {
getpts_simple(optarg + 1, SCAN_TCP_PORT, &o.ping_ackprobes, &o.num_ping_ackprobes);
if (o.num_ping_ackprobes <= 0) {
if (o.num_ping_ackprobes <= 0)
fatal("Bogus argument to -PB: %s", optarg + 1);
}
}
if (o.num_ping_ackprobes == 0) {
} else {
getpts_simple(DEFAULT_TCP_PROBE_PORT_SPEC, SCAN_TCP_PORT, &o.ping_ackprobes, &o.num_ping_ackprobes);
assert(o.num_ping_ackprobes > 0);
}
@ -1100,11 +1092,9 @@ int nmap_main(int argc, char *argv[]) {
o.pingtype |= PINGTYPE_PROTO;
if (*(optarg + 1) != '\0') {
getpts_simple(optarg + 1, SCAN_PROTOCOLS, &o.ping_protoprobes, &o.num_ping_protoprobes);
if (o.num_ping_protoprobes <= 0) {
if (o.num_ping_protoprobes <= 0)
fatal("Bogus argument to -PO: %s", optarg + 1);
}
}
if (o.num_ping_protoprobes == 0) {
} else {
getpts_simple(DEFAULT_PROTO_PROBE_PORT_SPEC, SCAN_PROTOCOLS, &o.ping_protoprobes, &o.num_ping_protoprobes);
assert(o.num_ping_protoprobes > 0);
}