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

merge soc07 r4871:4884 and r4888 - renaming __FUNCTION__ to __func__ and changing hardcoded func names to __func__

Browse source
This commit is contained in:
fyodor 2007-08-11 04:06:09 +00:00
parent 1540fe57c4
commit 8d74bbcd8a
23 changed files with 4328 additions and 3936 deletions
Download patch file Download diff file Expand all files Collapse all files

4
timing.cc
View file

@ -160,7 +160,7 @@ void adjust_timeouts2(const struct timeval *sent,
else {
if (delta >= 8000000 || delta < 0) {
if (o.verbose)
error("adjust_timeout: packet supposedly had rtt of %lu microseconds. Ignoring time.", delta);
error("%s: packet supposedly had rtt of %lu microseconds. Ignoring time.", __func__, delta);
return;
}
delta -= to->srtt;
@ -225,7 +225,7 @@ void enforce_scan_delay(struct timeval *tv) {
time_diff = TIMEVAL_MSEC_SUBTRACT(now, lastcall);
if (time_diff < (int) o.scan_delay) {
if (o.debugging > 1) {
printf("Sleeping for %d milliseconds in enforce_scan_delay()\n", o.scan_delay - time_diff);
printf("Sleeping for %d milliseconds in %s()\n", o.scan_delay - time_diff, __func__);
}
usleep((o.scan_delay - time_diff) * 1000);
gettimeofday(&lastcall, NULL);