1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-17 21:19:01 +00:00

Minor wrapping and whitespace fixes.

This commit is contained in:
henri
2012-01-13 12:59:18 +00:00
parent 520ff94839
commit 2cdd7e63f0
3 changed files with 15 additions and 11 deletions

View File

@@ -449,6 +449,7 @@ void nse_readpcap(nsock_event nsee, const unsigned char **l2_data, size_t *l2_le
int nsi_pcap_linktype(nsock_iod nsiod) {
msiod *nsi = (msiod *)nsiod;
mspcap *mp = (mspcap *)nsi->pcap;
assert(mp);
return (mp->datalink);
}
@@ -456,6 +457,7 @@ int nsi_pcap_linktype(nsock_iod nsiod) {
int nsi_is_pcap(nsock_iod nsiod) {
msiod *nsi = (msiod *)nsiod;
mspcap *mp = (mspcap *)nsi->pcap;
return (mp != NULL);
}

View File

@@ -74,10 +74,11 @@ nsock_event_id nsock_readlines(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handle
if (ms->tracelevel > 0) {
if (nsi->peerlen > 0)
nsock_trace(ms, "Read request for %d lines from IOD #%li [%s:%d] EID %li", nlines, nsi->id,
inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
nsock_trace(ms, "Read request for %d lines from IOD #%li [%s:%d] EID %li",
nlines, nsi->id, inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
else
nsock_trace(ms, "Read request for %d lines from IOD #%li (peer unspecified) EID %li", nlines, nsi->id, nse->id);
nsock_trace(ms, "Read request for %d lines from IOD #%li (peer unspecified) EID %li",
nlines, nsi->id, nse->id);
}
nse->readinfo.read_type = NSOCK_READLINES;
@@ -101,10 +102,11 @@ nsock_event_id nsock_readbytes(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handle
if (ms->tracelevel > 0) {
if (nsi->peerlen > 0)
nsock_trace(ms, "Read request for %d bytes from IOD #%li [%s:%d] EID %li", nbytes, nsi->id,
inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
nsock_trace(ms, "Read request for %d bytes from IOD #%li [%s:%d] EID %li",
nbytes, nsi->id, inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), nse->id);
else
nsock_trace(ms, "Read request for %d bytes from IOD #%li (peer unspecified) EID %li", nbytes, nsi->id, nse->id);
nsock_trace(ms, "Read request for %d bytes from IOD #%li (peer unspecified) EID %li",
nbytes, nsi->id, nse->id);
}
nse->readinfo.read_type = NSOCK_READBYTES;
@@ -128,8 +130,8 @@ nsock_event_id nsock_read(nsock_pool nsp, nsock_iod ms_iod, nsock_ev_handler han
if (ms->tracelevel > 0) {
if (nsi->peerlen > 0)
nsock_trace(ms, "Read request from IOD #%li [%s:%d] (timeout: %dms) EID %li", nsi->id,
inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), timeout_msecs, nse->id);
nsock_trace(ms, "Read request from IOD #%li [%s:%d] (timeout: %dms) EID %li",
nsi->id, inet_ntop_ez(&nsi->peer, nsi->peerlen), nsi_peerport(nsi), timeout_msecs, nse->id);
else
nsock_trace(ms, "Read request from IOD #%li (peer unspecified) (timeout: %dms) EID %li",
nsi->id, timeout_msecs, nse->id);