remove unused parameter 'name' from dissect_per_choice()

svn path=/trunk/; revision=15861

1 files changed, 54 insertions, 54 deletions

diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index edd7ae8134..286e6902e6 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* ./packet-h225.c                                                            */
+/* .\packet-h225.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */
 
 /* Input file: packet-h225-template.c */
@@ -1865,7 +1865,7 @@ static const per_choice_t T_h245routing_choice[] = {
 static int
 dissect_h225_T_h245routing(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_h245routing, T_h245routing_choice, "T_h245routing",
+                                 ett_h225_T_h245routing, T_h245routing_choice,
                                  NULL);
 
   return offset;
@@ -2098,7 +2098,7 @@ dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo
 	h221NonStandard = 0;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier",
+                                 ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice,
                                  &value);
 
 	switch (value) {
@@ -2203,7 +2203,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo
 	ipv4_port=0;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_H245TransportAddress, H245TransportAddress_choice, "H245TransportAddress",
+                                 ett_h225_H245TransportAddress, H245TransportAddress_choice,
                                  NULL);
 
 	/* we need this info for TAPing */
@@ -2353,7 +2353,7 @@ static const per_choice_t T_routing_choice[] = {
 static int
 dissect_h225_T_routing(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_routing, T_routing_choice, "T_routing",
+                                 ett_h225_T_routing, T_routing_choice,
                                  NULL);
 
   return offset;
@@ -2445,7 +2445,7 @@ static const per_choice_t TransportAddress_choice[] = {
 static int
 dissect_h225_TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_TransportAddress, TransportAddress_choice, "TransportAddress",
+                                 ett_h225_TransportAddress, TransportAddress_choice,
                                  NULL);
 
   return offset;
@@ -2532,7 +2532,7 @@ static const per_choice_t PublicTypeOfNumber_choice[] = {
 static int
 dissect_h225_PublicTypeOfNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_PublicTypeOfNumber, PublicTypeOfNumber_choice, "PublicTypeOfNumber",
+                                 ett_h225_PublicTypeOfNumber, PublicTypeOfNumber_choice,
                                  NULL);
 
   return offset;
@@ -2609,7 +2609,7 @@ static const per_choice_t PrivateTypeOfNumber_choice[] = {
 static int
 dissect_h225_PrivateTypeOfNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_PrivateTypeOfNumber, PrivateTypeOfNumber_choice, "PrivateTypeOfNumber",
+                                 ett_h225_PrivateTypeOfNumber, PrivateTypeOfNumber_choice,
                                  NULL);
 
   return offset;
@@ -2658,7 +2658,7 @@ static const per_choice_t PartyNumber_choice[] = {
 int
 dissect_h225_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_PartyNumber, PartyNumber_choice, "PartyNumber",
+                                 ett_h225_PartyNumber, PartyNumber_choice,
                                  NULL);
 
   return offset;
@@ -2745,7 +2745,7 @@ static const per_choice_t T_system_id_choice[] = {
 static int
 dissect_h225_T_system_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_system_id, T_system_id_choice, "T_system_id",
+                                 ett_h225_T_system_id, T_system_id_choice,
                                  NULL);
 
   return offset;
@@ -2852,7 +2852,7 @@ static const per_choice_t MobileUIM_choice[] = {
 static int
 dissect_h225_MobileUIM(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_MobileUIM, MobileUIM_choice, "MobileUIM",
+                                 ett_h225_MobileUIM, MobileUIM_choice,
                                  NULL);
 
   return offset;
@@ -2887,7 +2887,7 @@ static const per_choice_t AliasAddress_choice[] = {
 int
 dissect_h225_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_AliasAddress, AliasAddress_choice, "AliasAddress",
+                                 ett_h225_AliasAddress, AliasAddress_choice,
                                  NULL);
 
   return offset;
@@ -3467,7 +3467,7 @@ static const per_choice_t SupportedProtocols_choice[] = {
 static int
 dissect_h225_SupportedProtocols(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_SupportedProtocols, SupportedProtocols_choice, "SupportedProtocols",
+                                 ett_h225_SupportedProtocols, SupportedProtocols_choice,
                                  NULL);
 
   return offset;
@@ -3817,7 +3817,7 @@ static const per_choice_t TunnelledProtocol_id_choice[] = {
 static int
 dissect_h225_TunnelledProtocol_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_TunnelledProtocol_id, TunnelledProtocol_id_choice, "TunnelledProtocol_id",
+                                 ett_h225_TunnelledProtocol_id, TunnelledProtocol_id_choice,
                                  NULL);
 
   return offset;
@@ -3997,7 +3997,7 @@ static const per_choice_t T_conferenceGoal_choice[] = {
 static int
 dissect_h225_T_conferenceGoal(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_conferenceGoal, T_conferenceGoal_choice, "T_conferenceGoal",
+                                 ett_h225_T_conferenceGoal, T_conferenceGoal_choice,
                                  NULL);
 
   return offset;
@@ -4068,7 +4068,7 @@ static const per_choice_t CallType_choice[] = {
 static int
 dissect_h225_CallType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_CallType, CallType_choice, "CallType",
+                                 ett_h225_CallType, CallType_choice,
                                  NULL);
 
   return offset;
@@ -4127,7 +4127,7 @@ static const per_choice_t SecurityServiceMode_choice[] = {
 static int
 dissect_h225_SecurityServiceMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_SecurityServiceMode, SecurityServiceMode_choice, "SecurityServiceMode",
+                                 ett_h225_SecurityServiceMode, SecurityServiceMode_choice,
                                  NULL);
 
   return offset;
@@ -4185,7 +4185,7 @@ static const per_choice_t H245Security_choice[] = {
 static int
 dissect_h225_H245Security(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_H245Security, H245Security_choice, "H245Security",
+                                 ett_h225_H245Security, H245Security_choice,
                                  NULL);
 
   return offset;
@@ -4311,7 +4311,7 @@ static const per_choice_t CryptoH323Token_choice[] = {
 static int
 dissect_h225_CryptoH323Token(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_CryptoH323Token, CryptoH323Token_choice, "CryptoH323Token",
+                                 ett_h225_CryptoH323Token, CryptoH323Token_choice,
                                  NULL);
 
   return offset;
@@ -4417,7 +4417,7 @@ static const per_choice_t ScnConnectionType_choice[] = {
 static int
 dissect_h225_ScnConnectionType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_ScnConnectionType, ScnConnectionType_choice, "ScnConnectionType",
+                                 ett_h225_ScnConnectionType, ScnConnectionType_choice,
                                  NULL);
 
   return offset;
@@ -4450,7 +4450,7 @@ static const per_choice_t ScnConnectionAggregation_choice[] = {
 static int
 dissect_h225_ScnConnectionAggregation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_ScnConnectionAggregation, ScnConnectionAggregation_choice, "ScnConnectionAggregation",
+                                 ett_h225_ScnConnectionAggregation, ScnConnectionAggregation_choice,
                                  NULL);
 
   return offset;
@@ -4525,7 +4525,7 @@ static const per_choice_t PresentationIndicator_choice[] = {
 int
 dissect_h225_PresentationIndicator(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_PresentationIndicator, PresentationIndicator_choice, "PresentationIndicator",
+                                 ett_h225_PresentationIndicator, PresentationIndicator_choice,
                                  NULL);
 
   return offset;
@@ -4629,7 +4629,7 @@ static const per_choice_t T_billingMode_choice[] = {
 static int
 dissect_h225_T_billingMode(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_billingMode, T_billingMode_choice, "T_billingMode",
+                                 ett_h225_T_billingMode, T_billingMode_choice,
                                  NULL);
 
   return offset;
@@ -4670,7 +4670,7 @@ static const per_choice_t CallCreditServiceControl_callStartingPoint_choice[] =
 static int
 dissect_h225_CallCreditServiceControl_callStartingPoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_CallCreditServiceControl_callStartingPoint, CallCreditServiceControl_callStartingPoint_choice, "CallCreditServiceControl_callStartingPoint",
+                                 ett_h225_CallCreditServiceControl_callStartingPoint, CallCreditServiceControl_callStartingPoint_choice,
                                  NULL);
 
   return offset;
@@ -4720,7 +4720,7 @@ static const per_choice_t ServiceControlDescriptor_choice[] = {
 static int
 dissect_h225_ServiceControlDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_ServiceControlDescriptor, ServiceControlDescriptor_choice, "ServiceControlDescriptor",
+                                 ett_h225_ServiceControlDescriptor, ServiceControlDescriptor_choice,
                                  NULL);
 
   return offset;
@@ -4747,7 +4747,7 @@ static const per_choice_t ServiceControlSession_reason_choice[] = {
 static int
 dissect_h225_ServiceControlSession_reason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_ServiceControlSession_reason, ServiceControlSession_reason_choice, "ServiceControlSession_reason",
+                                 ett_h225_ServiceControlSession_reason, ServiceControlSession_reason_choice,
                                  NULL);
 
   return offset;
@@ -5151,7 +5151,7 @@ static const per_choice_t GenericIdentifier_choice[] = {
 static int
 dissect_h225_GenericIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_GenericIdentifier, GenericIdentifier_choice, "GenericIdentifier",
+                                 ett_h225_GenericIdentifier, GenericIdentifier_choice,
                                  NULL);
 
   return offset;
@@ -5278,7 +5278,7 @@ static const per_choice_t Content_choice[] = {
 static int
 dissect_h225_Content(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_Content, Content_choice, "Content",
+                                 ett_h225_Content, Content_choice,
                                  NULL);
 
   return offset;
@@ -5742,7 +5742,7 @@ static const per_choice_t SecurityErrors_choice[] = {
 static int
 dissect_h225_SecurityErrors(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_SecurityErrors, SecurityErrors_choice, "SecurityErrors",
+                                 ett_h225_SecurityErrors, SecurityErrors_choice,
                                  NULL);
 
   return offset;
@@ -5821,7 +5821,7 @@ dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb, int offset, packet_info *pinfo
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_ReleaseCompleteReason, ReleaseCompleteReason_choice, "ReleaseCompleteReason",
+                                 ett_h225_ReleaseCompleteReason, ReleaseCompleteReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -5898,7 +5898,7 @@ dissect_h225_FacilityReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p
 	guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_FacilityReason, FacilityReason_choice, "FacilityReason",
+                                 ett_h225_FacilityReason, FacilityReason_choice,
                                  &value);
 
 	h225_pi->reason = value;
@@ -6154,7 +6154,7 @@ dissect_h225_T_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo _
 
 	contains_faststart = FALSE;
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_h323_message_body, T_h323_message_body_choice, "T_h323_message_body",
+                                 ett_h225_T_h323_message_body, T_h323_message_body_choice,
                                  &message_body_val);
 
 	if (check_col(pinfo->cinfo, COL_INFO)){
@@ -6492,7 +6492,7 @@ static const per_choice_t AddressPattern_choice[] = {
 static int
 dissect_h225_AddressPattern(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_AddressPattern, AddressPattern_choice, "AddressPattern",
+                                 ett_h225_AddressPattern, AddressPattern_choice,
                                  NULL);
 
   return offset;
@@ -6613,7 +6613,7 @@ static const per_choice_t UseSpecifiedTransport_choice[] = {
 static int
 dissect_h225_UseSpecifiedTransport(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_UseSpecifiedTransport, UseSpecifiedTransport_choice, "UseSpecifiedTransport",
+                                 ett_h225_UseSpecifiedTransport, UseSpecifiedTransport_choice,
                                  NULL);
 
   return offset;
@@ -6700,7 +6700,7 @@ static const per_choice_t SecurityErrors2_choice[] = {
 static int
 dissect_h225_SecurityErrors2(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_SecurityErrors2, SecurityErrors2_choice, "SecurityErrors2",
+                                 ett_h225_SecurityErrors2, SecurityErrors2_choice,
                                  NULL);
 
   return offset;
@@ -6764,7 +6764,7 @@ static const per_choice_t EncryptIntAlg_choice[] = {
 static int
 dissect_h225_EncryptIntAlg(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_EncryptIntAlg, EncryptIntAlg_choice, "EncryptIntAlg",
+                                 ett_h225_EncryptIntAlg, EncryptIntAlg_choice,
                                  NULL);
 
   return offset;
@@ -6796,7 +6796,7 @@ static const per_choice_t NonIsoIntegrityMechanism_choice[] = {
 static int
 dissect_h225_NonIsoIntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_NonIsoIntegrityMechanism, NonIsoIntegrityMechanism_choice, "NonIsoIntegrityMechanism",
+                                 ett_h225_NonIsoIntegrityMechanism, NonIsoIntegrityMechanism_choice,
                                  NULL);
 
   return offset;
@@ -6825,7 +6825,7 @@ static const per_choice_t IntegrityMechanism_choice[] = {
 static int
 dissect_h225_IntegrityMechanism(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_IntegrityMechanism, IntegrityMechanism_choice, "IntegrityMechanism",
+                                 ett_h225_IntegrityMechanism, IntegrityMechanism_choice,
                                  NULL);
 
   return offset;
@@ -7057,7 +7057,7 @@ static const per_choice_t CallTerminationCause_choice[] = {
 static int
 dissect_h225_CallTerminationCause(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_CallTerminationCause, CallTerminationCause_choice, "CallTerminationCause",
+                                 ett_h225_CallTerminationCause, CallTerminationCause_choice,
                                  NULL);
 
   return offset;
@@ -7376,7 +7376,7 @@ dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinf
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_GatekeeperRejectReason, GatekeeperRejectReason_choice, "GatekeeperRejectReason",
+                                 ett_h225_GatekeeperRejectReason, GatekeeperRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -7666,7 +7666,7 @@ dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pi
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice, "RegistrationRejectReason",
+                                 ett_h225_RegistrationRejectReason, RegistrationRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -7730,7 +7730,7 @@ dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_UnregRequestReason, UnregRequestReason_choice, "UnregRequestReason",
+                                 ett_h225_UnregRequestReason, UnregRequestReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -7820,7 +7820,7 @@ dissect_h225_UnregRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_UnregRejectReason, UnregRejectReason_choice, "UnregRejectReason",
+                                 ett_h225_UnregRejectReason, UnregRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -7871,7 +7871,7 @@ static const per_choice_t CallModel_choice[] = {
 static int
 dissect_h225_CallModel(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_CallModel, CallModel_choice, "CallModel",
+                                 ett_h225_CallModel, CallModel_choice,
                                  NULL);
 
   return offset;
@@ -7928,7 +7928,7 @@ static const per_choice_t TransportQOS_choice[] = {
 static int
 dissect_h225_TransportQOS(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_TransportQOS, TransportQOS_choice, "TransportQOS",
+                                 ett_h225_TransportQOS, TransportQOS_choice,
                                  NULL);
 
   return offset;
@@ -8141,7 +8141,7 @@ dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice, "AdmissionRejectReason",
+                                 ett_h225_AdmissionRejectReason, AdmissionRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -8283,7 +8283,7 @@ dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_BandRejectReason, BandRejectReason_choice, "BandRejectReason",
+                                 ett_h225_BandRejectReason, BandRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -8339,7 +8339,7 @@ dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_DisengageReason, DisengageReason_choice, "DisengageReason",
+                                 ett_h225_DisengageReason, DisengageReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -8432,7 +8432,7 @@ dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_DisengageRejectReason, DisengageRejectReason_choice, "DisengageRejectReason",
+                                 ett_h225_DisengageRejectReason, DisengageRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -8587,7 +8587,7 @@ dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo
   guint32 value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_LocationRejectReason, LocationRejectReason_choice, "LocationRejectReason",
+                                 ett_h225_LocationRejectReason, LocationRejectReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -8812,7 +8812,7 @@ static const per_choice_t InfoRequestResponseStatus_choice[] = {
 static int
 dissect_h225_InfoRequestResponseStatus(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_InfoRequestResponseStatus, InfoRequestResponseStatus_choice, "InfoRequestResponseStatus",
+                                 ett_h225_InfoRequestResponseStatus, InfoRequestResponseStatus_choice,
                                  NULL);
 
   return offset;
@@ -9012,7 +9012,7 @@ dissect_h225_InfoRequestNakReason(tvbuff_t *tvb, int offset, packet_info *pinfo
   guint32 value;
 	
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_InfoRequestNakReason, InfoRequestNakReason_choice, "InfoRequestNakReason",
+                                 ett_h225_InfoRequestNakReason, InfoRequestNakReason_choice,
                                  &value);
 
   h225_pi->reason = value;
@@ -9113,7 +9113,7 @@ static const per_choice_t T_result_choice[] = {
 static int
 dissect_h225_T_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_T_result, T_result_choice, "T_result",
+                                 ett_h225_T_result, T_result_choice,
                                  NULL);
 
   return offset;
@@ -9242,7 +9242,7 @@ dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto
   	guint32 rasmessage_value;
 
   offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index,
-                                 ett_h225_RasMessage, RasMessage_choice, "RasMessage",
+                                 ett_h225_RasMessage, RasMessage_choice,
                                  &rasmessage_value);
 
 	if (check_col(pinfo->cinfo, COL_INFO)){