More signed vs. unsigned cleanups, and initialization cleanups, from

Joerg Mayer.

svn path=/trunk/; revision=3578

6 files changed, 20 insertions, 14 deletions

diff --git a/editcap.c b/editcap.c
index eada6e0745..0c26c46e27 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1,7 +1,7 @@
 /* Edit capture files.  We can delete records, or simply convert from one 
  * format to another format.
  *
- * $Id: editcap.c,v 1.14 2001/04/20 22:35:19 guy Exp $
+ * $Id: editcap.c,v 1.15 2001/06/19 23:08:55 guy Exp $
  *
  * Originally written by Richard Sharpe.
  * Improved by Guy Harris.
@@ -53,7 +53,7 @@ static int keep_em = 0;
 static int out_file_type = WTAP_FILE_PCAP;   /* default to "libpcap"   */
 static int out_frame_type = -2;              /* Leave frame type alone */
 static int verbose = 0;                      /* Not so verbose         */
-static int snaplen = 0;                      /* No limit               */
+static unsigned int snaplen = 0;             /* No limit               */
 
 /* Add a selection item, a simple parser for now */
 
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 47b46fbd6c..bfaa18a0f5 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ftype-time.c,v 1.8 2001/06/18 01:42:24 guy Exp $
+ * $Id: ftype-time.c,v 1.9 2001/06/19 23:08:57 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -263,6 +263,8 @@ ftype_register_time(void)
 		cmp_ge,
 		cmp_lt,
 		cmp_le,
+		NULL,
+		NULL
 	};
 	static ftype_t reltime_type = {
 		"FT_RELATIVE_TIME",
@@ -286,6 +288,8 @@ ftype_register_time(void)
 		cmp_ge,
 		cmp_lt,
 		cmp_le,
+		NULL,
+		NULL
 	};
 
 	ftype_register(FT_ABSOLUTE_TIME, &abstime_type);
diff --git a/file.c b/file.c
index e096b35d29..0bdaa4f8be 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /* file.c
  * File I/O routines
  *
- * $Id: file.c,v 1.240 2001/06/08 08:50:49 guy Exp $
+ * $Id: file.c,v 1.241 2001/06/19 23:08:55 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -893,7 +893,7 @@ rescan_packets(capture_file *cf, const char *action, gboolean refilter,
   gboolean stop_flag;
   guint32 progbar_quantum;
   guint32 progbar_nextstep;
-  int count;
+  unsigned int count;
   frame_data *selected_frame;
   int selected_row;
   int row;
@@ -1282,7 +1282,7 @@ change_time_formats(capture_file *cf)
   gboolean stop_flag;
   guint32 progbar_quantum;
   guint32 progbar_nextstep;
-  int count;
+  unsigned int count;
   int row;
   int i;
   GtkStyle  *pl_style;
@@ -1389,7 +1389,7 @@ find_packet(capture_file *cf, dfilter_t *sfcode)
   gboolean stop_flag;
   guint32 progbar_quantum;
   guint32 progbar_nextstep;
-  int count;
+  unsigned int count;
   proto_tree *protocol_tree;
   gboolean frame_matched;
   int row;
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index 6a1736b6b9..5dc16c8419 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
  * Copyright 2000, Axis Communications AB 
  * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
  *
- * $Id: packet-ieee80211.c,v 1.23 2001/06/18 02:17:47 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.24 2001/06/19 23:08:55 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -558,7 +558,8 @@ add_tagged_field (proto_tree * tree, tvbuff_t * tvb, int offset)
   const guint8 *tag_info_ptr;
   const guint8 *tag_data_ptr;
   guint32 tag_no, tag_len;
-  int i, n;
+  unsigned int i;
+  int n;
   char out_buff[SHORT_STR];
 
 
diff --git a/packet-ip.c b/packet-ip.c
index bec3b3451a..38a453df1e 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
 /* packet-ip.c
  * Routines for IP and miscellaneous IP protocol packet disassembly
  *
- * $Id: packet-ip.c,v 1.137 2001/06/18 02:17:47 guy Exp $
+ * $Id: packet-ip.c,v 1.138 2001/06/19 23:08:55 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -621,7 +621,7 @@ dissect_ip_tcp_options(tvbuff_t *tvb, int offset, guint length,
   u_char            opt;
   const ip_tcp_opt *optp;
   opt_len_type      len_type;
-  int               optlen;
+  unsigned int      optlen;
   char             *name;
   char              name_str[7+1+1+2+2+1+1];	/* "Unknown (0x%02x)" */
   void            (*dissect)(const struct ip_tcp_opt *, tvbuff_t *,
@@ -792,7 +792,8 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree *ip_tree = NULL, *field_tree;
   proto_item *ti, *tf;
   int        offset = 0;
-  guint      hlen, optlen, len, payload_len, reported_payload_len, padding;
+  guint      hlen, optlen, len, payload_len, reported_payload_len;
+  int        padding;
   guint16    flags;
   guint8     nxt;
   guint16    ipsum;
diff --git a/proto_hier_stats.c b/proto_hier_stats.c
index bb28b7269e..dc09fab34a 100644
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -1,7 +1,7 @@
 /* proto_hier_stats.c
  * Routines for calculating statistics based on protocol.
  *
- * $Id: proto_hier_stats.c,v 1.3 2001/03/24 02:07:20 guy Exp $
+ * $Id: proto_hier_stats.c,v 1.4 2001/06/19 23:08:55 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -155,7 +155,7 @@ ph_stats_new(void)
 	gboolean	stop_flag;
 	guint32		progbar_quantum;
 	guint32		progbar_nextstep;
-	int		count;
+	unsigned int	count;
 
 	/* Initialize the data */
 	ps = g_new(ph_stats_t, 1);