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-fcdns.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-fcdns.c')
| -rw-r--r-- | epan/dissectors/packet-fcdns.c | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 5a61c731a6..d12e5bc819 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -366,17 +366,15 @@ fcdns_init_protocol(void) static void dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const header_field_info *hfinfo) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint32 flags; flags = tvb_get_ntohl (tvb, offset); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, hfinfo, - tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_cos_flags); - } + item=proto_tree_add_uint(parent_tree, hfinfo, + tvb, offset, 1, flags); + tree=proto_item_add_subtree(item, ett_cos_flags); proto_tree_add_boolean(tree, &hfi_fcdns_cos_f, tvb, offset, 4, flags); if (flags&0x01){ @@ -423,17 +421,16 @@ dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const hea static void dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint8 flags, type; flags = tvb_get_guint8(tvb, offset); type = tvb_get_guint8(tvb, offset+1); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, + + item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_fc4features); - } + tree=proto_item_add_subtree(item, ett_fc4features); if(type==FC_TYPE_SCSI){ proto_tree_add_boolean(tree, &hfi_fcdns_fc4features_i, tvb, offset, 1, flags); @@ -457,16 +454,14 @@ dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset static void dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint8 flags; flags = tvb_get_guint8(tvb, offset); - if(parent_tree){ - item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, + item=proto_tree_add_uint(parent_tree, &hfi_fcdns_fc4features, tvb, offset, 1, flags); - tree=proto_item_add_subtree(item, ett_fc4features); - } + tree=proto_item_add_subtree(item, ett_fc4features); proto_tree_add_boolean(tree, &hfi_fcdns_fc4features_i, tvb, offset, 1, flags); if (flags&0x02){ @@ -487,15 +482,13 @@ dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset) static void dissect_fc4type (proto_tree *parent_tree, tvbuff_t *tvb, int offset, header_field_info *hfinfo) { - proto_item *item=NULL; - proto_tree *tree=NULL; + proto_item *item; + proto_tree *tree; guint32 flags; - if(parent_tree){ - item=proto_tree_add_item(parent_tree, hfinfo, tvb, offset, - 32, ENC_NA); - tree=proto_item_add_subtree(item, ett_fc4flags); - } + item=proto_tree_add_item(parent_tree, hfinfo, tvb, offset, + 32, ENC_NA); + tree=proto_item_add_subtree(item, ett_fc4flags); flags = tvb_get_ntohl (tvb, offset); |