mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 12:41:29 +00:00
merge soc07 r5233 - Changed perror()s with hardcoded function names to Nmap's gh_perror() and __func__, changed perror()s followed by exit()s to Nmap's pfatal(), and removed newlines from perror()s because it breaks the line after that and before the colon and error string, which doesn't make sense
This commit is contained in:
4
tcpip.cc
4
tcpip.cc
@@ -3235,14 +3235,14 @@ int recvtime(int sd, char *buf, int len, int seconds, int *timedout) {
|
||||
if (res > 0 ) {
|
||||
res = recv(sd, buf, len, 0);
|
||||
if (res >= 0) return res;
|
||||
perror("recv in recvtime");
|
||||
gh_perror("recv in %s", __func__);
|
||||
return 0;
|
||||
}
|
||||
else if (!res) {
|
||||
if (timedout) *timedout = 1;
|
||||
return 0;
|
||||
}
|
||||
perror("select() in recvtime");
|
||||
gh_perror("select() in %s", __func__);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user