diff options
author | pb <pb@FreeBSD.org> | 1999-11-18 10:20:45 +0000 |
---|---|---|
committer | pb <pb@FreeBSD.org> | 1999-11-18 10:20:45 +0000 |
commit | 162eda38602424e4e5964983b2738bf6c6202c85 (patch) | |
tree | d57e2b90dce7e70361760bee1aa53752be3a0d9f /sbin/ping | |
parent | 7773468c080c012b350f05ea15b5355aa0147be3 (diff) | |
download | FreeBSD-src-162eda38602424e4e5964983b2738bf6c6202c85.zip FreeBSD-src-162eda38602424e4e5964983b2738bf6c6202c85.tar.gz |
Make last commit bde-compliant:
- correct indentation
- change data types for consistency with the rest of ping.c
- create new variable separate from "answer" for clarity
Diffstat (limited to 'sbin/ping')
-rw-r--r-- | sbin/ping/ping.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index f96774d..1cd55fa 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -930,9 +930,10 @@ in_cksum(addr, len) register u_short *w = addr; register int sum = 0; union { - u_int16_t us; - u_int8_t uc[2]; - } answer; + u_short us; + u_char uc[2]; + } last; + u_short answer; /* * Our algorithm is simple, using a 32 bit accumulator (sum), we add @@ -946,16 +947,16 @@ in_cksum(addr, len) /* mop up an odd byte, if necessary */ if (nleft == 1) { - answer.uc[0] = *(u_char *)w; - answer.uc[1] = 0; - sum += answer.us; + last.uc[0] = *(u_char *)w; + last.uc[1] = 0; + sum += last.us; } /* add back carry outs from top 16 bits to low 16 bits */ sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */ sum += (sum >> 16); /* add carry */ - answer.us = ~sum; /* truncate to 16 bits */ - return(answer.us); + answer = ~sum; /* truncate to 16 bits */ + return(answer); } /* |