MSVC warnings removed

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10738 f5534014-38df-0310-8fa8-9805f1628bb7

5 files changed, 11 insertions, 10 deletions

diff --git a/packet-acse.c b/packet-acse.c
index 5b84022904..f44c3574dc 100644
--- a/packet-acse.c
+++ b/packet-acse.c
@@ -2,7 +2,7 @@
 *
 * Routine to dissect OSI ACSE Protocol packets
 *
-* $Id: packet-acse.c,v 1.4 2004/04/20 04:17:52 guy Exp $
+* $Id: packet-acse.c,v 1.5 2004/04/30 06:24:35 ulfl Exp $
 *
 * Yuriy Sidelnikov <YSidelnikov@hotmail.com>
 *
@@ -222,7 +222,7 @@ static packet_info *global_pinfo = NULL;
 /* dissector for data */
 static dissector_handle_t data_handle;
 static void
-call_app_dissector(tvbuff_t *tvb, int offset, guint16 param_len,
+call_app_dissector(tvbuff_t *tvb, gint offset, gint param_len,
     packet_info *pinfo, proto_tree *tree, proto_tree *param_tree)
 {
 	/* do we have OSI app packet dissector ? */
diff --git a/packet-cops.c b/packet-cops.c
index af618f7236..ac3231fd6f 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -13,7 +13,7 @@
  *
  * Implemented in ethereal at April 7-8, 2004
  *
- * $Id: packet-cops.c,v 1.45 2004/04/25 04:01:12 guy Exp $
+ * $Id: packet-cops.c,v 1.46 2004/04/30 06:24:35 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2134,8 +2134,9 @@ void info_to_display(tvbuff_t *tvb, proto_item *stt, int offset, int octets, cha
                 }
                 /* Ieee float format */
                 if (mode==FMT_FLT) {
+                    /* XXX - use proto_tree_add_float_format instead? */
                    proto_tree_add_uint_format(stt, *hf_proto_parameter,tvb, offset, octets,
-                       codefl,"%-28s : %.10g",str,codefl);
+                       (guint32) codefl,"%-28s : %.10g",str,codefl);
                    break;
                 }
                 /* Print a 32 bits integer */
diff --git a/packet-pres.c b/packet-pres.c
index 9ff0c9c99b..389b4d799f 100644
--- a/packet-pres.c
+++ b/packet-pres.c
@@ -2,7 +2,7 @@
 *
 * Routine to dissect ISO 8823 OSI Presentation Protocol packets
 *
-* $Id: packet-pres.c,v 1.4 2004/03/23 19:37:23 guy Exp $
+* $Id: packet-pres.c,v 1.5 2004/04/30 06:24:35 ulfl Exp $
 *
 * Yuriy Sidelnikov <YSidelnikov@hotmail.com>
 *
@@ -217,7 +217,7 @@ packet_info *global_pinfo = NULL;
 static dissector_handle_t data_handle;
 
 static void
-call_acse_dissector(tvbuff_t *tvb, int offset, guint16 param_len,
+call_acse_dissector(tvbuff_t *tvb, gint offset, gint param_len,
     packet_info *pinfo, proto_tree *tree, proto_tree *param_tree)
 {
 	/* do we have OSI acse/rose packet dissector ? */
diff --git a/packet-spnego.c b/packet-spnego.c
index be6a7b3453..f6acfc1bb6 100644
--- a/packet-spnego.c
+++ b/packet-spnego.c
@@ -5,7 +5,7 @@
  * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com>
  * Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com>
  *
- * $Id: packet-spnego.c,v 1.52 2004/04/02 22:01:21 sahlberg Exp $
+ * $Id: packet-spnego.c,v 1.53 2004/04/30 06:24:35 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -757,7 +757,7 @@ dissect_spnego_mechToken(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 	 * frame or we will not even attempt to dissect those bytes we
 	 * do have. (since there will be an exception)
 	 */
-	if(nbytes>tvb_length_remaining(tvb,offset)){
+	if((gint)nbytes>tvb_length_remaining(tvb,offset)){
 		nbytes=tvb_length_remaining(tvb,offset);
 	}
 	item = proto_tree_add_item(tree, hf_spnego_mechtoken, tvb, offset, 
diff --git a/packet-tcp.c b/packet-tcp.c
index b5115d262b..9ac4896b0a 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
 /* packet-tcp.c
  * Routines for TCP packet disassembly
  *
- * $Id: packet-tcp.c,v 1.229 2004/04/29 16:33:37 ulfl Exp $
+ * $Id: packet-tcp.c,v 1.230 2004/04/30 06:24:35 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1987,7 +1987,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
      * somewhere in the middle of a segment.
      */
     if(!pinfo->fd->flags.visited && tcp_analyze_seq){
-       gint remaining_bytes;
+       guint remaining_bytes;
        remaining_bytes=tvb_reported_length_remaining(tvb, offset);
        if(plen>remaining_bytes){
           pinfo->want_pdu_tracking=2;