diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-05-10 22:01:40 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2016-05-10 20:02:30 +0000 |
| commit | 88eb078d9ff5f9e069b43003c0455775f448b05d (patch) | |
| tree | 7463bf4ee8e7a9b56580a8389521a4f2de0fb3aa /epan/dissectors/packet-enttec.c | |
| parent | 6d62061aa919ceec6c78eb4f53f0c8e5bf9e2735 (diff) | |
enttec: remove some unnecessary if (tree) checks
Change-Id: Id108b0bacac377ad1f3fe7e999fb4d772bb69789
Reviewed-on: https://code.wireshark.org/review/15337
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-enttec.c')
| -rw-r--r-- | epan/dissectors/packet-enttec.c | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 40f1c78bc0..ec39323450 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -332,7 +332,7 @@ dissect_enttec_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da { gint offset = 0; guint32 head = 0; - proto_tree *ti,*enttec_tree=NULL; + proto_tree *ti, *enttec_tree; /* * If not enough bytes for the header word, not an ENTTEC packet. @@ -367,39 +367,35 @@ dissect_enttec_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(head, enttec_head_vals, "Unknown (0x%08x)")); - if (tree) { - ti = proto_tree_add_item(tree, proto_enttec, tvb, offset, -1, ENC_NA); - enttec_tree = proto_item_add_subtree(ti, ett_enttec); - } - - if (enttec_tree) { - proto_tree_add_item(enttec_tree, hf_enttec_head, tvb, - offset, 4, ENC_BIG_ENDIAN ); - offset += 4; + ti = proto_tree_add_item(tree, proto_enttec, tvb, offset, -1, ENC_NA); + enttec_tree = proto_item_add_subtree(ti, ett_enttec); - switch (head) { - case ENTTEC_HEAD_ESPR: - offset = dissect_enttec_poll_reply( tvb, offset, enttec_tree); - break; + proto_tree_add_item(enttec_tree, hf_enttec_head, tvb, + offset, 4, ENC_BIG_ENDIAN ); + offset += 4; - case ENTTEC_HEAD_ESPP: - offset = dissect_enttec_poll( tvb, offset, enttec_tree); - break; + switch (head) { + case ENTTEC_HEAD_ESPR: + offset = dissect_enttec_poll_reply( tvb, offset, enttec_tree); + break; - case ENTTEC_HEAD_ESAP: - offset = dissect_enttec_ack( tvb, offset, enttec_tree); - break; + case ENTTEC_HEAD_ESPP: + offset = dissect_enttec_poll( tvb, offset, enttec_tree); + break; - case ENTTEC_HEAD_ESDD: - offset = dissect_enttec_dmx_data( tvb, offset, enttec_tree); - break; + case ENTTEC_HEAD_ESAP: + offset = dissect_enttec_ack( tvb, offset, enttec_tree); + break; - case ENTTEC_HEAD_ESZZ: - offset = dissect_enttec_reset( tvb, offset, enttec_tree); - break; - } + case ENTTEC_HEAD_ESDD: + offset = dissect_enttec_dmx_data( tvb, offset, enttec_tree); + break; + case ENTTEC_HEAD_ESZZ: + offset = dissect_enttec_reset( tvb, offset, enttec_tree); + break; } + return offset; } |