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-asap.c | |
| parent | 3fc441e7a5008640c68ec985e669d5092414a519 (diff) | |
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-asap.c')
| -rw-r--r-- | epan/dissectors/packet-asap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index 4c1e6de52c..d4f034ecd5 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -172,9 +172,8 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); padding_length = tvb_length(cause_tvb) - length; - cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), - "%s", val_to_str_const(code, cause_code_values, "Unknown error cause")); - cause_tree = proto_item_add_subtree(cause_item, ett_asap_cause); + cause_tree = proto_tree_add_subtree(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, -1, ett_asap_cause, &cause_item, + val_to_str_const(code, cause_code_values, "Unknown error cause")); proto_tree_add_item(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, ENC_BIG_ENDIAN); proto_tree_add_item(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, ENC_BIG_ENDIAN); @@ -650,8 +649,8 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree) padding_length = tvb_length(parameter_tvb) - length; /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str_const(type, parameter_type_values, "Unknown Parameter")); - parameter_tree = proto_item_add_subtree(parameter_item, ett_asap_parameter); + parameter_tree = proto_tree_add_subtree(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, + ett_asap_parameter, ¶meter_item, val_to_str_const(type, parameter_type_values, "Unknown Parameter")); /* add tag and length to the asap tree */ proto_tree_add_item(parameter_tree, hf_parameter_type, parameter_tvb, PARAMETER_TYPE_OFFSET, PARAMETER_TYPE_LENGTH, ENC_BIG_ENDIAN); |