make dissect_ber_choice take a guint* that will return the

index of the branch taken or -1  to make prettifications easier to implement.


change the signature of dissect_ber_choice and rename it to dissect_ber_CHOICE to catch all
occurences of the use of this function

update asn2eth to use the new name/signature

update all occurences of this function to the new name and new signature.



svn path=/trunk/; revision=14758

1 files changed, 36 insertions, 36 deletions

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 2df0585a59..2867667c19 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -431,8 +431,8 @@ static const ber_choice_t ObjectClass_choice[] = {
 
 static int
 dissect_cmip_ObjectClass(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              ObjectClass_choice, hf_index, ett_cmip_ObjectClass);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              ObjectClass_choice, hf_index, ett_cmip_ObjectClass, NULL);
 
   return offset;
 }
@@ -472,8 +472,8 @@ static const ber_choice_t ObjectInstance_choice[] = {
 
 static int
 dissect_cmip_ObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              ObjectInstance_choice, hf_index, ett_cmip_ObjectInstance, NULL);
 
   return offset;
 }
@@ -565,8 +565,8 @@ static const ber_choice_t AttributeId_choice[] = {
 
 static int
 dissect_cmip_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              AttributeId_choice, hf_index, ett_cmip_AttributeId);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              AttributeId_choice, hf_index, ett_cmip_AttributeId, NULL);
 
   return offset;
 }
@@ -678,8 +678,8 @@ static const ber_choice_t GetInfoStatus_choice[] = {
 
 static int
 dissect_cmip_GetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              GetInfoStatus_choice, hf_index, ett_cmip_GetInfoStatus, NULL);
 
   return offset;
 }
@@ -803,8 +803,8 @@ static const ber_choice_t SetInfoStatus_choice[] = {
 
 static int
 dissect_cmip_SetInfoStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              SetInfoStatus_choice, hf_index, ett_cmip_SetInfoStatus, NULL);
 
   return offset;
 }
@@ -954,8 +954,8 @@ static const ber_choice_t NoSuchArgument_choice[] = {
 
 static int
 dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              NoSuchArgument_choice, hf_index, ett_cmip_NoSuchArgument, NULL);
 
   return offset;
 }
@@ -1068,8 +1068,8 @@ static const ber_choice_t InvalidArgumentValue_choice[] = {
 
 static int
 dissect_cmip_InvalidArgumentValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              InvalidArgumentValue_choice, hf_index, ett_cmip_InvalidArgumentValue, NULL);
 
   return offset;
 }
@@ -1094,8 +1094,8 @@ static const ber_choice_t ErrorInfo_choice[] = {
 
 static int
 dissect_cmip_ErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              ErrorInfo_choice, hf_index, ett_cmip_ErrorInfo, NULL);
 
   return offset;
 }
@@ -1351,8 +1351,8 @@ static const ber_choice_t Scope_choice[] = {
 
 static int
 dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              Scope_choice, hf_index, ett_cmip_Scope);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              Scope_choice, hf_index, ett_cmip_Scope, NULL);
 
   return offset;
 }
@@ -1377,8 +1377,8 @@ static const ber_choice_t T_substrings_item_choice[] = {
 
 static int
 dissect_cmip_T_substrings_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              T_substrings_item_choice, hf_index, ett_cmip_T_substrings_item, NULL);
 
   return offset;
 }
@@ -1428,8 +1428,8 @@ static const ber_choice_t FilterItem_choice[] = {
 
 static int
 dissect_cmip_FilterItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              FilterItem_choice, hf_index, ett_cmip_FilterItem);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              FilterItem_choice, hf_index, ett_cmip_FilterItem, NULL);
 
   return offset;
 }
@@ -1474,8 +1474,8 @@ static const ber_choice_t CMISFilter_choice[] = {
 
 static int
 dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              CMISFilter_choice, hf_index, ett_cmip_CMISFilter);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              CMISFilter_choice, hf_index, ett_cmip_CMISFilter, NULL);
 
   return offset;
 }
@@ -1642,8 +1642,8 @@ static const ber_choice_t LinkedReplyArgument_choice[] = {
 
 static int
 dissect_cmip_LinkedReplyArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              LinkedReplyArgument_choice, hf_index, ett_cmip_LinkedReplyArgument, NULL);
 
   return offset;
 }
@@ -1784,8 +1784,8 @@ static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = {
 
 static int
 dissect_cmip_T_managedOrSuperiorObjectInstance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              T_managedOrSuperiorObjectInstance_choice, hf_index, ett_cmip_T_managedOrSuperiorObjectInstance, NULL);
 
   return offset;
 }
@@ -2070,8 +2070,8 @@ static const ber_choice_t InvokeId_choice[] = {
 
 static int
 dissect_cmip_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              InvokeId_choice, hf_index, ett_cmip_InvokeId);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              InvokeId_choice, hf_index, ett_cmip_InvokeId, NULL);
 
   return offset;
 }
@@ -2097,8 +2097,8 @@ static const ber_choice_t InvokeLinkedId_choice[] = {
 
 static int
 dissect_cmip_InvokeLinkedId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              InvokeLinkedId_choice, hf_index, ett_cmip_InvokeLinkedId);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              InvokeLinkedId_choice, hf_index, ett_cmip_InvokeLinkedId, NULL);
 
   return offset;
 }
@@ -2313,8 +2313,8 @@ static const ber_choice_t RejectProb_choice[] = {
 
 static int
 dissect_cmip_RejectProb(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              RejectProb_choice, hf_index, ett_cmip_RejectProb);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              RejectProb_choice, hf_index, ett_cmip_RejectProb, NULL);
 
   return offset;
 }
@@ -2362,8 +2362,8 @@ static const ber_choice_t ROS_choice[] = {
 
 int
 dissect_cmip_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_choice(pinfo, tree, tvb, offset,
-                              ROS_choice, hf_index, ett_cmip_ROS);
+  offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset,
+                              ROS_choice, hf_index, ett_cmip_ROS, NULL);
 
   return offset;
 }