Avoid collison with error(), clean up code a bit.

[tcpdump] / in_cksum.c

diff --git a/in_cksum.c b/in_cksum.c
index efbc38e0bf37cd12638319ba9524c635db9227ee..0f19befcfbb0b3ce00a7948ce8469c2720e49c50 100644 (file)
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -73,7 +73,7 @@ in_cksum(const struct cksum_vec *vec, int veclen)
        for (; veclen != 0; vec++, veclen--) {
                if (vec->len == 0)
                        continue;
-               w = (const uint16_t *)(void *)vec->ptr;
+               w = (const uint16_t *)(const void *)vec->ptr;
                if (mlen == -1) {
                        /*
                         * The first byte of this chunk is the continuation
@@ -85,7 +85,7 @@ in_cksum(const struct cksum_vec *vec, int veclen)
                         */
                        s_util.c[1] = *(const uint8_t *)w;
                        sum += s_util.s;
-                       w = (const uint16_t *)(void *)((const uint8_t *)w + 1);
+                       w = (const uint16_t *)(const void *)((const uint8_t *)w + 1);
                        mlen = vec->len - 1;
                } else
                        mlen = vec->len;
@@ -96,7 +96,7 @@ in_cksum(const struct cksum_vec *vec, int veclen)
                        REDUCE;
                        sum <<= 8;
                        s_util.c[0] = *(const uint8_t *)w;
-                       w = (const uint16_t *)(void *)((const uint8_t *)w + 1);
+                       w = (const uint16_t *)(const void *)((const uint8_t *)w + 1);
                        mlen--;
                        byte_swapped = 1;
                }