diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-02-25 21:41:27 +0300 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-03-03 15:33:19 +0000 |
| commit | 2286437b2f146ae43aa7e0b3c3161e34d4a87ab7 (patch) | |
| tree | 22a9dfa826da31fd3fadd431a062a6b2f7b9cb21 | |
| parent | e6d241597e623cc15ff98c4533f5cdd543094641 (diff) | |
remove unnecessary if (tree) check
Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675
Reviewed-on: https://code.wireshark.org/review/458
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 4ff1fbdd73..2ee8bd276b 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -4760,7 +4760,7 @@ dissect_dvbci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U const gchar *event_str; guint16 len_field; proto_item *ti, *ti_hdr; - proto_tree *dvbci_tree = NULL, *hdr_tree = NULL; + proto_tree *dvbci_tree, *hdr_tree; tvbuff_t *payload_tvb; guint16 cor_addr; guint8 cor_value; @@ -4791,17 +4791,15 @@ dissect_dvbci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_PROTOCOL, "DVB-CI"); col_set_str(pinfo->cinfo, COL_INFO, event_str); - if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_dvbci, - tvb, 0, packet_len, "DVB Common Interface: %s", event_str); - dvbci_tree = proto_item_add_subtree(ti, ett_dvbci); - ti_hdr = proto_tree_add_text(dvbci_tree, tvb, 0, offset, "Pseudo header"); - hdr_tree = proto_item_add_subtree(ti_hdr, ett_dvbci_hdr); - proto_tree_add_text(hdr_tree, tvb, offset_ver, 1, "Version: %d", version); - proto_tree_add_item(hdr_tree, hf_dvbci_event, tvb, offset_evt, 1, ENC_BIG_ENDIAN); - proto_tree_add_text(hdr_tree, tvb, offset_len_field, 2, - "Length field: %d", len_field); - } + ti = proto_tree_add_protocol_format(tree, proto_dvbci, + tvb, 0, packet_len, "DVB Common Interface: %s", event_str); + dvbci_tree = proto_item_add_subtree(ti, ett_dvbci); + ti_hdr = proto_tree_add_text(dvbci_tree, tvb, 0, offset, "Pseudo header"); + hdr_tree = proto_item_add_subtree(ti_hdr, ett_dvbci_hdr); + proto_tree_add_text(hdr_tree, tvb, offset_ver, 1, "Version: %d", version); + proto_tree_add_item(hdr_tree, hf_dvbci_event, tvb, offset_evt, 1, ENC_BIG_ENDIAN); + proto_tree_add_text(hdr_tree, tvb, offset_len_field, 2, + "Length field: %d", len_field); if (IS_DATA_TRANSFER(event)) { dvbci_set_addrs(event, pinfo); |