diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2017-03-19 20:45:20 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-19 22:53:35 +0000 |
| commit | 2a3473820da5834b7d3732a3c6e314245839a673 (patch) | |
| tree | 270389cdab6db1cadf5c38bd84f1c3f90c709929 /epan/dissectors/packet-eth.c | |
| parent | 401f9018738243b2568b13662e0655dc3403917b (diff) | |
eth: remove unnecessary NULL checks
We may safely call proto_item_add_subtree() when the item is NULL.
Make sure that expert info are not filtered out by a NULL check.
Change-Id: I4516cd750c9b0b568c8de9adaad757d0ea769ad6
Reviewed-on: https://code.wireshark.org/review/20639
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 1159e2289a..30cfc9f64c 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -384,8 +384,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, address_with_resolution_to_str(wmem_packet_scope(), &pinfo->dst)); fh_tree = proto_item_add_subtree(ti, ett_ether); addr_item = proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst_addr); - if (addr_item) - addr_tree = proto_item_add_subtree(addr_item, ett_addr); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, dst_addr_name); PROTO_ITEM_SET_GENERATED(addr_item); @@ -399,8 +398,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); addr_item = proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); - if (addr_item) - addr_tree = proto_item_add_subtree(addr_item, ett_addr); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_src_resolved, tvb, 6, 6, src_addr_name); PROTO_ITEM_SET_GENERATED(addr_item); @@ -443,10 +441,8 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, fh_tree=NULL; } - addr_item=proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst_addr); - if(addr_item){ - addr_tree = proto_item_add_subtree(addr_item, ett_addr); - } + addr_item = proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst_addr); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, dst_addr_name); PROTO_ITEM_SET_GENERATED(addr_item); @@ -459,10 +455,8 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); - addr_item=proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); - if(addr_item){ - addr_tree = proto_item_add_subtree(addr_item, ett_addr); - } + addr_item = proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); addr_item=proto_tree_add_string(addr_tree, hf_eth_src_resolved, tvb, 6, 6, src_addr_name); PROTO_ITEM_SET_GENERATED(addr_item); @@ -500,11 +494,9 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, fh_tree = proto_item_add_subtree(ti, ett_ether2); } - addr_item=proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst_addr); - if(addr_item){ - addr_tree = proto_item_add_subtree(addr_item, ett_addr); - } - addr_item=proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, + addr_item = proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst_addr); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); + addr_item = proto_tree_add_string(addr_tree, hf_eth_dst_resolved, tvb, 0, 6, dst_addr_name); PROTO_ITEM_SET_GENERATED(addr_item); PROTO_ITEM_SET_HIDDEN(addr_item); @@ -516,12 +508,10 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_item(addr_tree, hf_eth_lg, tvb, 0, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_eth_ig, tvb, 0, 3, ENC_BIG_ENDIAN); - addr_item=proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); - if(addr_item){ - addr_tree = proto_item_add_subtree(addr_item, ett_addr); - if (tvb_get_guint8(tvb, 6) & 0x01) { - expert_add_info(pinfo, addr_item, &ei_eth_src_not_group); - } + addr_item = proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src_addr); + addr_tree = proto_item_add_subtree(addr_item, ett_addr); + if (tvb_get_guint8(tvb, 6) & 0x01) { + expert_add_info(pinfo, addr_item, &ei_eth_src_not_group); } addr_item=proto_tree_add_string(addr_tree, hf_eth_src_resolved, tvb, 6, 6, src_addr_name); |