remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related

use add_oid_str_name() and get_oid_str_name() instead of them

svn path=/trunk/; revision=18595

1 files changed, 52 insertions, 51 deletions

diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index f929e461ed..3134e8575a 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -38,6 +38,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
+#include <epan/oid_resolv.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -142,7 +143,7 @@ static int hf_acp133_OnSupported_acp127_pn = -1;
 static int hf_acp133_OnSupported_acp127_tn = -1;
 
 /*--- End of included file: packet-acp133-hf.c ---*/
-#line 55 "packet-acp133-template.c"
+#line 56 "packet-acp133-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_acp133 = -1;
@@ -170,7 +171,7 @@ static gint ett_acp133_Capability = -1;
 static gint ett_acp133_SET_OF_ExtendedContentType = -1;
 
 /*--- End of included file: packet-acp133-ett.c ---*/
-#line 59 "packet-acp133-template.c"
+#line 60 "packet-acp133-template.c"
 
 
 /*--- Included file: packet-acp133-fn.c ---*/
@@ -1155,7 +1156,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
 /*--- End of included file: packet-acp133-fn.c ---*/
-#line 61 "packet-acp133-template.c"
+#line 62 "packet-acp133-template.c"
 
 
 /*--- proto_register_acp133 -------------------------------------------*/
@@ -1477,7 +1478,7 @@ void proto_register_acp133(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-acp133-hfarr.c ---*/
-#line 70 "packet-acp133-template.c"
+#line 71 "packet-acp133-template.c"
   };
 
   /* List of subtrees */
@@ -1507,7 +1508,7 @@ void proto_register_acp133(void) {
     &ett_acp133_SET_OF_ExtendedContentType,
 
 /*--- End of included file: packet-acp133-ettarr.c ---*/
-#line 76 "packet-acp133-template.c"
+#line 77 "packet-acp133-template.c"
   };
 
   /* Register protocol */
@@ -1568,59 +1569,59 @@ void proto_reg_handoff_acp133(void) {
 
 
 /*--- End of included file: packet-acp133-dis-tab.c ---*/
-#line 92 "packet-acp133-template.c"
+#line 93 "packet-acp133-template.c"
 
   /* X.402 Object Classes */
-  register_ber_oid_name("2.6.5.1.0","id-oc-mhs-distribution-list");
-  register_ber_oid_name("2.6.5.1.1","id-oc-mhs-message-store");
-  register_ber_oid_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent");
-  register_ber_oid_name("2.6.5.1.3","id-oc-mhs-user");
+  add_oid_str_name("2.6.5.1.0","id-oc-mhs-distribution-list");
+  add_oid_str_name("2.6.5.1.1","id-oc-mhs-message-store");
+  add_oid_str_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent");
+  add_oid_str_name("2.6.5.1.3","id-oc-mhs-user");
 
   /* SDN.701 Object Classes */
-  register_ber_oid_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user");
-  register_ber_oid_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms");
+  add_oid_str_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user");
+  add_oid_str_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms");
 
   /* ACP133 Object Classes */
-  register_ber_oid_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.60", "id-oc-network");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB");
-  register_ber_oid_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB");
+  add_oid_str_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData");
+  add_oid_str_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA");
+  add_oid_str_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator");
+  add_oid_str_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA");
+  add_oid_str_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA");
+  add_oid_str_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA");
+  add_oid_str_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName");
+  add_oid_str_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit");
+  add_oid_str_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled");
+  add_oid_str_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription");
+  add_oid_str_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser");
+  add_oid_str_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList");
+  add_oid_str_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127");
+  add_oid_str_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway");
+  add_oid_str_name("2.16.840.1.101.2.2.3.60", "id-oc-network");
+  add_oid_str_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions");
+  add_oid_str_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation");
+  add_oid_str_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson");
+  add_oid_str_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent");
+  add_oid_str_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA");
+  add_oid_str_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser");
+  add_oid_str_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA");
+  add_oid_str_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB");
+  add_oid_str_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB");
 
   /* gateway types */
-  register_ber_oid_name("2.16.840.1.101.2.2.5.0", "acp120-acp127");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.1", "acp120-janap128");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.2", "acp120-mhs");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.5", "boundaryMTA");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822");
-  register_ber_oid_name("2.16.840.1.101.2.2.5.8", "mta-acp127");
+  add_oid_str_name("2.16.840.1.101.2.2.5.0", "acp120-acp127");
+  add_oid_str_name("2.16.840.1.101.2.2.5.1", "acp120-janap128");
+  add_oid_str_name("2.16.840.1.101.2.2.5.2", "acp120-mhs");
+  add_oid_str_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs");
+  add_oid_str_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822");
+  add_oid_str_name("2.16.840.1.101.2.2.5.5", "boundaryMTA");
+  add_oid_str_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs");
+  add_oid_str_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822");
+  add_oid_str_name("2.16.840.1.101.2.2.5.8", "mta-acp127");
 
 }