Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / in_cksum.c

diff --git a/in_cksum.c b/in_cksum.c
index efbc38e0bf37cd12638319ba9524c635db9227ee..eb7c634f0ab0e60f49bed330530cf762c55a2d71 100644 (file)
--- a/in_cksum.c
+++ b/in_cksum.c
@@ -36,12 +36,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#include "netdissect.h"
 
 /*
  * Checksum routine for Internet Protocol family headers (Portable Version).
@@ -56,9 +56,9 @@
 uint16_t
 in_cksum(const struct cksum_vec *vec, int veclen)
 {
-       register const uint16_t *w;
-       register int sum = 0;
-       register int mlen = 0;
+       const uint16_t *w;
+       int sum = 0;
+       int mlen = 0;
        int byte_swapped = 0;
 
        union {
@@ -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,18 +85,18 @@ 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;
                /*
                 * Force to even boundary.
                 */
-               if ((1 & (unsigned long) w) && (mlen > 0)) {
+               if ((1 & (uintptr_t) w) && (mlen > 0)) {
                        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;
                }
@@ -196,5 +196,5 @@ in_cksum_shouldbe(uint16_t sum, uint16_t computed_sum)
        shouldbe += ntohs(computed_sum);
        shouldbe = (shouldbe & 0xFFFF) + (shouldbe >> 16);
        shouldbe = (shouldbe & 0xFFFF) + (shouldbe >> 16);
-       return shouldbe;
+       return (uint16_t)shouldbe;
 }