convert to proto_tree_add_subtree[_format] for ASN.1 dissectors

Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef
Reviewed-on: https://code.wireshark.org/review/2509
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 20 insertions, 21 deletions

diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 177ed17089..dace418fce 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -16417,7 +16417,7 @@ dissect_rrc_ActivationTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 
 static int
 dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 877 "../../asn1/rrc/rrc.cnf"
+#line 876 "../../asn1/rrc/rrc.cnf"
 
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             1U, 32U, &rbid, FALSE);
@@ -16434,7 +16434,7 @@ dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 static int
 dissect_rrc_RLC_SequenceNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 883 "../../asn1/rrc/rrc.cnf"
+#line 882 "../../asn1/rrc/rrc.cnf"
 
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 4095U, &activation_frame, FALSE);
@@ -16454,7 +16454,7 @@ static const per_sequence_t RB_ActivationTimeInfo_sequence[] = {
 
 static int
 dissect_rrc_RB_ActivationTimeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 855 "../../asn1/rrc/rrc.cnf"
+#line 854 "../../asn1/rrc/rrc.cnf"
   fp_info       *fpinf;
   rrc_ciphering_info * c_inf;
 
@@ -16608,7 +16608,6 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1
 #line 677 "../../asn1/rrc/rrc.cnf"
   tvbuff_t *nas_sys_info_gsm_map_tvb = NULL;
   guint32 length;
-  proto_item *item;
   proto_tree *subtree;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -16619,18 +16618,18 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1
     if (actx->private_data) {
       switch (GPOINTER_TO_UINT(actx->private_data)-1) {
         case RRC_NAS_SYS_INFO_CN_COMMON:
-          item = proto_tree_add_text(tree, nas_sys_info_gsm_map_tvb, 0, length, "CN Common GSM-MAP NAS system information");
-          subtree = proto_item_add_subtree(item, ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo);
+          subtree = proto_tree_add_subtree(tree, nas_sys_info_gsm_map_tvb, 0, length,
+					ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, NULL, "CN Common GSM-MAP NAS system information");
           de_cn_common_gsm_map_nas_sys_info(nas_sys_info_gsm_map_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
           break;
         case RRC_NAS_SYS_INFO_CS:
-          item = proto_tree_add_text(tree, nas_sys_info_gsm_map_tvb, 0, length, "CS domain specific system information");
-          subtree = proto_item_add_subtree(item, ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo);
+          subtree = proto_tree_add_subtree(tree, nas_sys_info_gsm_map_tvb, 0, length,
+					ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, NULL, "CS domain specific system information");
           de_cs_domain_spec_sys_info(nas_sys_info_gsm_map_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
           break;
         case RRC_NAS_SYS_INFO_PS:
-          item = proto_tree_add_text(tree, nas_sys_info_gsm_map_tvb, 0, length, "PS domain specific system information");
-          subtree = proto_item_add_subtree(item, ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo);
+          subtree = proto_tree_add_subtree(tree, nas_sys_info_gsm_map_tvb, 0, length,
+				ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, NULL, "PS domain specific system information");
           de_ps_domain_spec_sys_info(nas_sys_info_gsm_map_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
           break;
         default:
@@ -20537,7 +20536,7 @@ dissect_rrc_T_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_
 
 static int
 dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 785 "../../asn1/rrc/rrc.cnf"
+#line 784 "../../asn1/rrc/rrc.cnf"
   tvbuff_t *hrnti_tvb;
   struct rrc_info *rrcinf;
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
@@ -20546,7 +20545,7 @@ dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 
 
 
-#line 790 "../../asn1/rrc/rrc.cnf"
+#line 789 "../../asn1/rrc/rrc.cnf"
   rrcinf = (struct rrc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rrc, 0);
   if (!rrcinf) {
     rrcinf = wmem_new0(wmem_file_scope(), struct rrc_info);
@@ -41370,7 +41369,7 @@ dissect_rrc_RLC_Info_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 static int
 dissect_rrc_MAC_d_FlowIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 782 "../../asn1/rrc/rrc.cnf"
+#line 781 "../../asn1/rrc/rrc.cnf"
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 7U, &flowd, FALSE);
 
@@ -41418,7 +41417,7 @@ static const per_choice_t DL_TransportChannelType_r5_choice[] = {
 
 static int
 dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 711 "../../asn1/rrc/rrc.cnf"
+#line 710 "../../asn1/rrc/rrc.cnf"
 
     gint *flowd_p;
     gint *cur_val=NULL;
@@ -44892,7 +44891,7 @@ static const per_choice_t DL_TransportChannelType_r7_choice[] = {
 
 static int
 dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 746 "../../asn1/rrc/rrc.cnf"
+#line 745 "../../asn1/rrc/rrc.cnf"
 
     gint *flowd_p;
     gint *cur_val=NULL;
@@ -87506,7 +87505,7 @@ static const per_choice_t DL_DCCH_MessageType_choice[] = {
 
 static int
 dissect_rrc_DL_DCCH_MessageType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 887 "../../asn1/rrc/rrc.cnf"
+#line 886 "../../asn1/rrc/rrc.cnf"
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_DL_DCCH_MessageType, DL_DCCH_MessageType_choice,
                                  &msg_type);
@@ -87526,7 +87525,7 @@ static const per_sequence_t DL_DCCH_Message_sequence[] = {
 
 static int
 dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 890 "../../asn1/rrc/rrc.cnf"
+#line 889 "../../asn1/rrc/rrc.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_DL_DCCH_Message, DL_DCCH_Message_sequence);
 
@@ -87540,7 +87539,7 @@ dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 static int
 dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 798 "../../asn1/rrc/rrc.cnf"
+#line 797 "../../asn1/rrc/rrc.cnf"
   tvbuff_t * start_val;
   fp_info       *fpinf;
   rrc_ciphering_info * c_inf;
@@ -114235,7 +114234,7 @@ static const per_choice_t HandoverToUTRANCommand_choice[] = {
 
 static int
 dissect_rrc_HandoverToUTRANCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 893 "../../asn1/rrc/rrc.cnf"
+#line 892 "../../asn1/rrc/rrc.cnf"
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_HandoverToUTRANCommand, HandoverToUTRANCommand_choice,
                                  NULL);
@@ -114376,7 +114375,7 @@ static const per_sequence_t UE_SecurityInformation_sequence[] = {
 
 static int
 dissect_rrc_UE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 896 "../../asn1/rrc/rrc.cnf"
+#line 895 "../../asn1/rrc/rrc.cnf"
   actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CS+1);
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UE_SecurityInformation, UE_SecurityInformation_sequence);
@@ -114779,7 +114778,7 @@ static const per_sequence_t UE_SecurityInformation2_sequence[] = {
 
 static int
 dissect_rrc_UE_SecurityInformation2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 900 "../../asn1/rrc/rrc.cnf"
+#line 899 "../../asn1/rrc/rrc.cnf"
   actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_PS+1);
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UE_SecurityInformation2, UE_SecurityInformation2_sequence);