diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-25 22:59:50 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-26 11:41:10 +0000 |
| commit | f7987091bab94f2403024c34702e9d5007a5d790 (patch) | |
| tree | a56b8dfd1c87a789563ffa3b8a7277c4bd127afe /epan/dissectors/packet-fc.c | |
| parent | 732656c6f3636ba7e0672a9d8fc878255f0f8d3f (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66
Reviewed-on: https://code.wireshark.org/review/2667
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 4bd49d173f..737c7d1162 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -350,7 +350,6 @@ static void dissect_fc_ba_acc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti; proto_tree *acc_tree; int offset = 0; @@ -360,8 +359,7 @@ dissect_fc_ba_acc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "BA_ACC"); if (tree) { - ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); - acc_tree = proto_item_add_subtree (ti, ett_fcbls); + acc_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_fcbls, NULL, "Basic Link Svc"); proto_tree_add_item (acc_tree, hf_fc_bls_seqid_vld, tvb, offset++, 1, ENC_BIG_ENDIAN); proto_tree_add_item (acc_tree, hf_fc_bls_lastvld_seqid, tvb, offset++, 1, ENC_BIG_ENDIAN); @@ -380,7 +378,6 @@ static void dissect_fc_ba_rjt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Set up structures needed to add the protocol subtree and manage it */ - proto_item *ti; proto_tree *rjt_tree; int offset = 0; @@ -390,8 +387,7 @@ dissect_fc_ba_rjt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_INFO, "BA_RJT"); if (tree) { - ti = proto_tree_add_text (tree, tvb, 0, tvb_length (tvb), "Basic Link Svc"); - rjt_tree = proto_item_add_subtree (ti, ett_fcbls); + rjt_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_fcbls, NULL, "Basic Link Svc"); proto_tree_add_item (rjt_tree, hf_fc_bls_rjtcode, tvb, offset+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (rjt_tree, hf_fc_bls_rjtdetail, tvb, offset+2, 1, ENC_BIG_ENDIAN); @@ -565,18 +561,16 @@ dissect_fc_vft(proto_tree *parent_tree, static void dissect_fc_fctl(packet_info *pinfo _U_, proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint32 flags; flags = tvb_get_guint8 (tvb, offset); flags = (flags<<8) | tvb_get_guint8 (tvb, offset+1); flags = (flags<<8) | tvb_get_guint8 (tvb, offset+2); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hf_fc_fctl, tvb, offset, 3, flags); - tree=proto_item_add_subtree(item, ett_fctl); - } + item=proto_tree_add_uint(parent_tree, hf_fc_fctl, tvb, offset, 3, flags); + tree=proto_item_add_subtree(item, ett_fctl); proto_tree_add_boolean(tree, hf_fc_fctl_exchange_responder, tvb, offset, 3, flags); if (flags&FC_FCTL_EXCHANGE_RESPONDER){ |