diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-05-15 01:44:53 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-05-15 01:44:53 +0000 |
| commit | 931cc922a14049c904a6ac416656c36caf01d6b3 (patch) | |
| tree | 3d1112b08a02413f491bfad24d294022e8ef867c /epan/dissectors/packet-fddi.c | |
| parent | 78f4e06717899b3e6504300f3b47e61bc3989ee6 (diff) | |
Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25305
Diffstat (limited to 'epan/dissectors/packet-fddi.c')
| -rw-r--r-- | epan/dissectors/packet-fddi.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index 49fb89ba2d..0195c25282 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -267,7 +267,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean bitswapped) { proto_tree *fh_tree = NULL; - proto_item *ti; + proto_item *ti, *hidden_item; const gchar *fc_str; proto_tree *fc_tree; static guchar src[6], dst[6]; @@ -333,11 +333,14 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); - proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); + hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); + PROTO_ITEM_SET_HIDDEN(hidden_item); /* hide some bit-swapped mac address fields in the proto_tree, just in case */ - proto_tree_add_ether_hidden(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped); - proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped); + hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped); + PROTO_ITEM_SET_HIDDEN(hidden_item); + hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped); + PROTO_ITEM_SET_HIDDEN(hidden_item); } /* Extract the source address, possibly bit-swapping it. */ @@ -355,11 +358,14 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); - proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); + hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); + PROTO_ITEM_SET_HIDDEN(hidden_item); /* hide some bit-swapped mac address fields in the proto_tree, just in case */ - proto_tree_add_ether_hidden(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped); - proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped); + hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped); + PROTO_ITEM_SET_HIDDEN(hidden_item); + hidden_item = proto_tree_add_ether(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped); + PROTO_ITEM_SET_HIDDEN(hidden_item); } next_tvb = tvb_new_subset(tvb, FDDI_HEADER_SIZE + FDDI_PADDING, -1, -1); |