diff options
| author | Bill Meier <wmeier@newsguy.com> | 2015-01-25 15:51:01 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2015-01-25 22:04:42 +0000 |
| commit | be798e18f4bab165944f6d5ab0ff661f09ea7870 (patch) | |
| tree | 8b589220492c8367f317b8982d5f669457674e27 /epan/dissectors | |
| parent | 065304cae189c7e00e9dafd650575efaaf48b2fb (diff) | |
pana, gsm_abis_oml, rsl, netrom: Remove 'if (tree)'
Thou shalt call col_...() and/or a dissector under 'if(tree)'
Change-Id: Ibe62bc8229cb759d5f8b092aa7143d8e2f799037
Reviewed-on: https://code.wireshark.org/review/6781
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-gsm_abis_oml.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-netrom.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-pana.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-rsl.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index 699af49256..2e7e14a8ed 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -1823,7 +1823,7 @@ dissect_abis_oml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data col_set_str(pinfo->cinfo, COL_PROTOCOL, "OML"); top_tree = tree; - if (tree) { + /* if (tree) */ { guint8 msg_disc = tvb_get_guint8(tvb, offset); guint8 len = tvb_get_guint8(tvb, offset+3); diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index fc065b5676..1947aabd20 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -231,7 +231,7 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr( pinfo->cinfo, COL_INFO, "%s", val_to_str_const( op_code, op_code_vals_text, "Unknown" )); - if ( tree ) + /* if ( tree ) */ { /* create display subtree for the protocol */ diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 8381530f49..a326e68072 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -630,9 +630,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) avp_tvb = tvb_new_subset_length(tvb, offset, avp_length); avp_tree = proto_tree_add_subtree(pana_tree, tvb, offset, avp_length, ett_pana_avp, NULL, "Attribute Value Pairs"); - if (avp_tree != NULL) { - dissect_avps(avp_tvb, pinfo, avp_tree); - } + dissect_avps(avp_tvb, pinfo, avp_tree); } } diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index d0b944bdb5..6cb6ab51a3 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -3813,7 +3813,7 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",val_to_str_ext(msg_type, &rsl_msg_type_vals_ext,"unknown %u")); top_tree = tree; - if (tree) { + /* if (tree) */ { ti = proto_tree_add_item(tree, proto_rsl, tvb, 0, -1, ENC_NA); /* if nanoBTS specific vendor messages are not enabled, skip */ |