diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-22 16:01:36 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-22 21:07:16 +0000 |
| commit | 188aa9a80eea47842988f1b860931d25e1ca08bd (patch) | |
| tree | 9b6faf83e26edb43fe6befe6d2ff01c4b6daaa89 /epan/dissectors/packet-aruba-iap.c | |
| parent | 3fc441e7a5008640c68ec985e669d5092414a519 (diff) | |
| download | wireshark-188aa9a80eea47842988f1b860931d25e1ca08bd.tar.gz | |
convert to proto_tree_add_subtree[_format]
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df
Reviewed-on: https://code.wireshark.org/review/2560
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-aruba-iap.c')
| -rw-r--r-- | epan/dissectors/packet-aruba-iap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-aruba-iap.c b/epan/dissectors/packet-aruba-iap.c index 3f6c41558d..ecc62b4e12 100644 --- a/epan/dissectors/packet-aruba-iap.c +++ b/epan/dissectors/packet-aruba-iap.c @@ -53,8 +53,8 @@ static int hf_iap_unknown_bytes = -1; static int dissect_aruba_iap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - proto_tree *ti = NULL; - proto_tree *aruba_iap_tree = NULL; + proto_tree *ti; + proto_tree *aruba_iap_tree; guint16 magic; int offset = 0; @@ -68,10 +68,8 @@ dissect_aruba_iap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAP"); col_clear(pinfo->cinfo, COL_INFO); - if (tree) { - ti = proto_tree_add_item(tree, proto_aruba_iap, tvb, 0, 0, ENC_NA); - aruba_iap_tree = proto_item_add_subtree(ti, ett_aruba_iap); - } + ti = proto_tree_add_item(tree, proto_aruba_iap, tvb, 0, 0, ENC_NA); + aruba_iap_tree = proto_item_add_subtree(ti, ett_aruba_iap); proto_tree_add_item(aruba_iap_tree, hf_iap_magic, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; |