diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-21 20:50:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-21 20:50:13 +0000 |
| commit | 63c8b20360159ad9ce5fdc5f37973bed1bb42138 (patch) | |
| tree | 18803cc7d157de8be6d4c900288324474c695612 /epan/dissectors/packet-ethertype.c | |
| parent | dad2b947032bb905a2ffd5a94b598723c475d8c8 (diff) | |
Widen the Ethertype to a guint, to avoid compiler warnings.
Fix indentation while we're at it.
svn path=/trunk/; revision=53493
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index cd3157a3a8..878067bf56 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -288,7 +288,7 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat next_tvb = tvb_new_subset(tvb, ethertype_data->offset_after_ethertype, captured_length, reported_length); - p_add_proto_data(pinfo->fd, proto_ethertype, 0, GUINT_TO_POINTER(ethertype_data->etype)); + p_add_proto_data(pinfo->fd, proto_ethertype, 0, GUINT_TO_POINTER((guint)ethertype_data->etype)); /* Look for sub-dissector, and call it if found. Catch exceptions, so that if the reported length of "next_tvb" |