unsigned/signed mixup

diff --git a/Makefile-devel-adds b/Makefile-devel-adds
index 512a1199795c2ecceba1b6da8bb5b3a402ee6fcc..6e761086c70136022cfc3508f1629573e0edf7f7 100644 (file)
--- a/Makefile-devel-adds
+++ b/Makefile-devel-adds
@@ -1,14 +1,14 @@
 #
 # Auto-regenerate configure script or Makefile when things change.
 #
 # Auto-regenerate configure script or Makefile when things change.

-# From autoconf.info .  Works best with GNU Make.
+# From autoconf-2.13.info .  Works best with GNU Make.

 #
 ${srcdir}/configure: configure.in
 #
 ${srcdir}/configure: configure.in

-       cd ${srcdir} && autoconf
+       cd ${srcdir} && autoconf-2.13

 
 

-# autoheader might not change config.h.in, so touch a stamp file.
+# autoheader-2.13 might not change config.h.in, so touch a stamp file.

 ${srcdir}/config.h.in: ${srcdir}/stamp-h.in
 ${srcdir}/stamp-h.in: configure.in acconfig.h
 ${srcdir}/config.h.in: ${srcdir}/stamp-h.in
 ${srcdir}/stamp-h.in: configure.in acconfig.h

-       cd ${srcdir} && autoheader
+       cd ${srcdir} && autoheader-2.13

        echo timestamp > ${srcdir}/stamp-h.in
 
 config.h: stamp-h
        echo timestamp > ${srcdir}/stamp-h.in
 
 config.h: stamp-h

diff --git a/print-esp.c b/print-esp.c
index cc9236aed66092e894cc6a863d668cda6e7ee94f..9dbc0b3fcfb7624d07d909f17e18c7113bd09cb6 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.43 2003-08-06 04:59:48 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.44 2003-10-28 03:16:36 itojun Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -226,7 +226,8 @@ static void esp_print_decode_onesecret(char *line)
        if (decode) {
                char *colon, *p;
                char  espsecret_key[256];
        if (decode) {
                char *colon, *p;
                char  espsecret_key[256];

-               int len, i;
+               int len;
+               size_t i;

                const EVP_CIPHER *evp;
                int ivlen = 8;
                int authlen = 0;
                const EVP_CIPHER *evp;
                int ivlen = 8;
                int authlen = 0;

diff --git a/print-icmp6.c b/print-icmp6.c
index 0a8bdfe59b9d26cf720ccfabb040f7c6a893b382..e252563a98896dd1f21697cea4512ef81a6e1cfa 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.71 2003-06-07 11:57:53 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.72 2003-10-28 03:16:36 itojun Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -104,7 +104,7 @@ print_lladdr(const u_int8_t *p, size_t l)
 static int icmp6_cksum(const struct ip6_hdr *ip6, const struct icmp6_hdr *icp,
        int len)
 {
 static int icmp6_cksum(const struct ip6_hdr *ip6, const struct icmp6_hdr *icp,
        int len)
 {

-       int i;
+       size_t i;

        register const u_int16_t *sp;
        u_int32_t sum;
        union {
        register const u_int16_t *sp;
        u_int32_t sum;
        union {

diff --git a/print-tcp.c b/print-tcp.c
index d42cfe4543c861e12dfc92c61cab306a348a8360..2b7c610cf4a6081b2be5a925bf084cb9e0d4e145 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.105 2003-06-07 11:57:54 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.106 2003-10-28 03:16:36 itojun Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -133,7 +133,7 @@ static int tcp_cksum(register const struct ip *ip,
 static int tcp6_cksum(const struct ip6_hdr *ip6, const struct tcphdr *tp,
        int len)
 {
 static int tcp6_cksum(const struct ip6_hdr *ip6, const struct tcphdr *tp,
        int len)
 {

-       int i, tlen;
+       size_t i, tlen;

        register const u_int16_t *sp;
        u_int32_t sum;
        union {
        register const u_int16_t *sp;
        u_int32_t sum;
        union {