aboutsummaryrefslogtreecommitdiffstats
path: root/packet-vlan.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-02-05 02:47:31 +0000
committerGuy Harris <guy@alum.mit.edu>2001-02-05 02:47:31 +0000
commit60ce2f6158217e56240d20e765a497b9e3dffdb5 (patch)
tree456b2e8d72be58a4808c6696489469506466390d /packet-vlan.c
parent39d2be965be50f0fec8048e44450862643787042 (diff)
downloadwireshark-60ce2f6158217e56240d20e765a497b9e3dffdb5.tar.gz
wireshark-60ce2f6158217e56240d20e765a497b9e3dffdb5.tar.bz2
wireshark-60ce2f6158217e56240d20e765a497b9e3dffdb5.zip
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
Diffstat (limited to 'packet-vlan.c')
-rw-r--r--packet-vlan.c4
1 files changed, 2 insertions, 2 deletions
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;