diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-12-17 23:35:29 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-12-17 23:35:29 +0000 |
| commit | b886ff9755ee458bf214c0e68382a47791b500a1 (patch) | |
| tree | 3c1841cfc3cd95ebf2e74a94096daebeac920343 /packet-null.c | |
| parent | 9649edc5849fef871a3f54d564bd435958ecbb3d (diff) | |
removed some more MSVC warnings (type casting)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9332 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-null.c')
| -rw-r--r-- | packet-null.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-null.c b/packet-null.c index 03572c7600..1cf359869b 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.62 2003/11/14 10:11:11 guy Exp $ + * $Id: packet-null.c,v 1.63 2003/12/17 23:35:29 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -321,7 +321,7 @@ capture_null( const guchar *pd, int len, packet_counts *ld ) * BSD derivatives have different values?). */ if (null_header > IEEE_802_3_MAX_LEN) - capture_ethertype(null_header, pd, 4, len, ld); + capture_ethertype((guint16) null_header, pd, 4, len, ld); else { switch (null_header) { @@ -424,7 +424,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fh_tree = proto_item_add_subtree(ti, ett_null); } else fh_tree = NULL; - ethertype(null_header, tvb, 4, pinfo, tree, fh_tree, hf_null_etype, -1, + ethertype((guint16) null_header, tvb, 4, pinfo, tree, fh_tree, hf_null_etype, -1, 0); } else { /* populate a tree in the second pane with the status of the link |