diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2018-02-22 22:43:24 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-23 05:13:34 +0000 |
| commit | 1ccfef8b3fca63cbdd7839ebf205bd6d1f7193bb (patch) | |
| tree | 82aa23eea57de4f82327f6c85734abeed70b67f6 | |
| parent | 51cd1db521131239af212ac0424eb7b2319cdd5f (diff) | |
ans: remove unnecessary if (tree) checks
Change-Id: I381fbb7d5654c4061ed35db94269f50d49fbeafe
Reviewed-on: https://code.wireshark.org/review/26014
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ans.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index b91367b699..5a825a4ee9 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -55,7 +55,7 @@ static int dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; - proto_tree *ans_tree = NULL; + proto_tree *ans_tree; guint16 sender_id; guint32 seq_num; @@ -67,16 +67,15 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) col_add_fstr(pinfo->cinfo, COL_INFO, "Sequence: %u, Sender ID %u, Team ID %s", seq_num, sender_id, tvb_ether_to_str(tvb, 10)); - if (tree) { - ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, ENC_NA); - ans_tree = proto_item_add_subtree(ti, ett_ans); + ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, ENC_NA); + ans_tree = proto_item_add_subtree(ti, ett_ans); + + proto_tree_add_item(ans_tree, hf_ans_app_id, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ans_tree, hf_ans_rev_id, tvb, 2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ans_tree, hf_ans_seq_num, tvb, 4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(ans_tree, hf_ans_sender_id, tvb, 8, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ans_tree, hf_ans_team_id, tvb, 10, 6, ENC_NA); - proto_tree_add_item(ans_tree, hf_ans_app_id, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ans_tree, hf_ans_rev_id, tvb, 2, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ans_tree, hf_ans_seq_num, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item(ans_tree, hf_ans_sender_id, tvb, 8, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(ans_tree, hf_ans_team_id, tvb, 10, 6, ENC_NA); - } return tvb_captured_length(tvb); } |