Fix up some MSVC complaints about (narrowing) type conversions by

widening formal arguments or narrowing variables passed as actual
arguments.

svn path=/trunk/; revision=2993

5 files changed, 10 insertions, 10 deletions

diff --git a/packet-diameter.c b/packet-diameter.c
index cab0e95207..8449f4802b 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
 /* packet-diameter.c
  * Routines for DIAMETER packet disassembly
  *
- * $Id: packet-diameter.c,v 1.11 2001/01/09 06:31:35 guy Exp $
+ * $Id: packet-diameter.c,v 1.12 2001/02/05 02:47:31 guy Exp $
  *
  * Copyright (c) 2000 by David Frascone <chaos@mindspring.com>
  *
@@ -150,7 +150,7 @@ static guint32 match_numval(guint32 val, const value_value_pair *vs)
   return(0);
 }
 
-static gchar *rdconvertbufftostr(gchar *dest,guint8 length,const guint8 *pd)
+static gchar *rdconvertbufftostr(gchar *dest,int length,const guint8 *pd)
 {
 /*converts the raw buffer into printable text */
 guint32 i;
diff --git a/packet-osi-options.c b/packet-osi-options.c
index fc716dcf07..02b089cd65 100644
--- a/packet-osi-options.c
+++ b/packet-osi-options.c
@@ -5,7 +5,7 @@
  * ISO 10589 ISIS (Intradomain Routeing Information Exchange Protocol)
  * ISO  9542 ESIS (End System To Intermediate System Routeing Exchange Protocol)
  *
- * $Id: packet-osi-options.c,v 1.4 2000/11/19 04:14:26 guy Exp $
+ * $Id: packet-osi-options.c,v 1.5 2001/02/05 02:47:31 guy Exp $
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
  * Ethereal - Network traffic analyzer
@@ -169,7 +169,7 @@ static const value_string osi_opt_rfd_reassembly[] = {
      
 
 void
-dissect_option_qos( const u_char type, const u_char sub_type, u_char offset,
+dissect_option_qos( const u_char type, const u_char sub_type, int offset,
                     u_char len, tvbuff_t *tvb, proto_tree *tree ) {
 
   u_char      tmp_type = 0;
diff --git a/packet-radius.c b/packet-radius.c
index 7bb763d211..1afc1d0442 100644
--- a/packet-radius.c
+++ b/packet-radius.c
@@ -1,7 +1,7 @@
 /* packet-radius.c
  * Routines for RADIUS packet disassembly
  *
- * $Id: packet-radius.c,v 1.24 2001/01/22 08:54:06 guy Exp $
+ * $Id: packet-radius.c,v 1.25 2001/02/05 02:47:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Johan Feyaerts
@@ -480,7 +480,7 @@ guint32 match_numval(guint32 val, const value_value_pair *vs)
 
 static gchar textbuffer[2000];
 
-gchar *rdconvertbufftostr(gchar *dest,guint8 length,const guint8 *pd)
+gchar *rdconvertbufftostr(gchar *dest,int length,const guint8 *pd)
 {
 /*converts the raw buffer into printable text */
 guint32 i;
diff --git a/packet-vlan.c b/packet-vlan.c
index a85c1070db..cf072f79e0 100644
--- a/packet-vlan.c
+++ b/packet-vlan.c
@@ -1,7 +1,7 @@
 /* packet-vlan.c
  * Routines for VLAN 802.1Q ethernet header disassembly
  *
- * $Id: packet-vlan.c,v 1.31 2001/01/21 22:51:46 guy Exp $
+ * $Id: packet-vlan.c,v 1.32 2001/02/05 02:47:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -56,7 +56,7 @@ static dissector_handle_t llc_handle;
 
 void
 capture_vlan(const u_char *pd, int offset, packet_counts *ld ) {
-  guint32 encap_proto;
+  guint16 encap_proto;
   if ( !BYTES_ARE_IN_FRAME(offset,5) ) {
     ld->other++;
     return; 
diff --git a/packet-vtp.c b/packet-vtp.c
index 78cc6670f6..460698b0f3 100644
--- a/packet-vtp.c
+++ b/packet-vtp.c
@@ -1,7 +1,7 @@
 /* packet-vtp.c
  * Routines for the disassembly of Cisco's Virtual Trunking Protocol
  *
- * $Id: packet-vtp.c,v 1.11 2001/01/22 03:33:45 guy Exp $
+ * $Id: packet-vtp.c,v 1.12 2001/02/05 02:47:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -269,7 +269,7 @@ dissect_vlan_info(tvbuff_t *tvb, int offset, proto_tree *tree)
 	int vlan_info_left;
 	guint8 status;
 	guint8 vlan_name_len;
-	guint16 type;
+	guint8 type;
 	int length;
 	char *type_str;
 	proto_tree *tlv_tree;