Wireshark · Ethereal-dev: [Ethereal-dev] HFILL + signed-unsigned fixes - giop

[Frank Singleton <frank.singleton@xxxxxxxxxxxx>]

Hi,

Here is a patch to fix the remaining compiler warnings
related to HFILL and signed-unsigned comparison warnings,
inside packet-giop.c

It was diffed against the 2000-06-18 nightly tarball.

/Frank

-- 
EUS/SV/Z Frank Singleton      ASO Americas BSS
Office : +1 972 583 3251      ECN 800 33251  
Mobile : +1 214 228 0874      Amateur Radio: VK3FCS/KM5WS   
Email : frank.singleton@xxxxxxxxxxxx

Hardware: HP Omnibook 4150 running Redhat Linux 7.1 (2.4.2-2 kernel).

--- packet-giop.c.orig	Mon Jun 18 15:23:16 2001
+++ packet-giop.c	Tue Jun 19 07:43:56 2001
@@ -762,7 +762,6 @@
 
 
 
-
 static int giop_objkey_init_count = 100; /* storage size for our permanent data */
                                          /* ie: 100 entries -- needs tweaking -- FS */
 
@@ -1100,7 +1099,7 @@
 static guint32 giop_hash_objkey_hash(gconstpointer v) {
   struct giop_object_key *key = (struct giop_object_key *)v;
 
-  int i;
+  guint32 i;
   guint32 val = 0;		/* init hash value */
 
 
@@ -1215,7 +1214,7 @@
   gint8 tmpval_lsb;
   gint8 tmpval_msb;
   gint8 tmpval;		/* complete value */
-  int i;
+  guint32 i;
 
   *out = g_new0(guint8, in_len); /* allocate buffer */
 
@@ -1819,7 +1818,7 @@
  */
 
 static gchar * make_printable_string (gchar *in, guint32 len) {
-  int i = 0;
+  guint32 i = 0;
   gchar *print_string = NULL;
 
   print_string = (gchar * )g_malloc0(len + 1); /* make some space and zero it */
@@ -3894,17 +3893,17 @@
 
     { &hf_giop_type_boolean,
       { "TypeCode boolean data", "giop.tcboolean",
-	FT_BOOLEAN, BASE_DEC,  NULL, 0x0, "" }
+	FT_BOOLEAN, BASE_DEC,  NULL, 0x0, "", HFILL }
     },
 
     { &hf_giop_type_char,
       { "TypeCode char data", "giop.tcchar",
-	FT_UINT8, BASE_DEC,  NULL, 0x0, "" }
+	FT_UINT8, BASE_DEC,  NULL, 0x0, "", HFILL }
     },
 
     { &hf_giop_type_double,
       { "TypeCode double data", "giop.tcdouble",
-	FT_DOUBLE, BASE_DEC,  NULL, 0x0, "" }
+	FT_DOUBLE, BASE_DEC,  NULL, 0x0, "", HFILL }
     },
 
     { &hf_giop_type_enum,
@@ -3918,7 +3917,7 @@
 
     { &hf_giop_type_float,
       { "TypeCode float data", "giop.tcfloat",
-	FT_DOUBLE, BASE_DEC,  NULL, 0x0, "" }
+	FT_DOUBLE, BASE_DEC,  NULL, 0x0, "", HFILL }
     },
 
     { &hf_giop_type_long,
@@ -3928,7 +3927,7 @@
 
     { &hf_giop_type_octet,
       { "TypeCode octet data", "giop.tcoctet",
-	FT_UINT8, BASE_DEC,  NULL, 0x0, "" }
+	FT_UINT8, BASE_DEC,  NULL, 0x0, "", HFILL }
     },
 
     { &hf_giop_type_short,
@@ -3938,7 +3937,7 @@
 
     { &hf_giop_type_string,
       { "TypeCode string data", "giop.tcstring",
-	FT_STRING, BASE_DEC,  NULL, 0x0, "" }
+	FT_STRING, BASE_DEC,  NULL, 0x0, "", HFILL }
     },
 
     { &hf_giop_type_ulong,
@@ -4082,7 +4081,7 @@
 
   gchar *repobuf = NULL;	/* for repository ID */
 
-  int i;
+  guint32 i;
 
   /* Get type_id  == Repository ID */
 
@@ -4204,7 +4203,7 @@
 				    guint32 boundary, gboolean stream_is_big_endian, gchar *repo_id_buf,
 				    gboolean store_flag) {
 
-  int i;			/* loop index */
+  guint32 i;			/* loop index */
 
   guint8 v_major,v_minor;	/* IIOP sersion */
   gchar *buf = NULL;
@@ -4439,7 +4438,7 @@
   gchar *context_data = NULL;
   gchar *p_context_data = NULL;
 
-  int i;
+  guint32 i;
   guint32 vscid;		/* Vendor Service context id */
   guint32 scid;
 
@@ -4602,7 +4601,7 @@
 
   guint32 count;    /* parameter count (of tuples)  */
   guint32 seqlen;   /* sequence length */
-  int i;	    /* loop index */
+  guint32 i;	    /* loop index */
 
   /* get sequence lengt,h new endianness and boundary for encapsulation */
   seqlen = get_CDR_encap_info(tvb, tree, offset, 
@@ -4649,7 +4648,7 @@
 
   guint32 count;    /* parameter count (of tuples)  */
   guint32 seqlen;   /* sequence length */
-  int i;	    /* loop index */
+  guint32 i;	    /* loop index */
 
   /* get sequence legnth, new endianness and boundary for encapsulation */
   seqlen = get_CDR_encap_info(tvb, tree, offset, 
@@ -4705,7 +4704,7 @@
 
   guint32 count;    /* parameter count (of tuples)  */
   guint32 seqlen;   /* sequence length */
-  int i;	    /* loop index */
+  guint32 i;	    /* loop index */
 
   /* get sequence length, new endianness and boundary for encapsulation */
   seqlen = get_CDR_encap_info(tvb, tree, offset, 
@@ -4830,7 +4829,7 @@
 
   guint32 count;    /* parameter count (of tuples)  */
   guint32 seqlen;   /* sequence length */
-  int i;	    /* loop index */
+  guint32 i;	    /* loop index */
 
   /* get sequence length, new endianness and boundary for encapsulation */
   seqlen = get_CDR_encap_info(tvb, tree, offset, 
@@ -4876,7 +4875,7 @@
 
   guint32 count;    /* parameter count (of tuples)  */
   guint32 seqlen;   /* sequence length */
-  int i;	    /* loop index */
+  guint32 i;	    /* loop index */
 
   /* get sequence length, new endianness and boundary for encapsulation */
   seqlen = get_CDR_encap_info(tvb, tree, offset,