diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 16:53:16 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 16:53:16 +0100 |
commit | 791509c62741a0a1cd7ea2155c3a5f51517594d0 (patch) | |
tree | 1a29e3d0cd24060f79e9b76af02976767f2d200e /TAO/tao/CORBALOC_Parser.cpp | |
parent | 74d46d603c2f34cbd675287f40ceaff6a21007fa (diff) | |
download | ATCD-791509c62741a0a1cd7ea2155c3a5f51517594d0.tar.gz |
Use std string operations instead of ACE_OS
* TAO/tao/Acceptor_Registry.cpp:
* TAO/tao/Adapter_Registry.cpp:
* TAO/tao/AnyTypeCode/Any.cpp:
* TAO/tao/AnyTypeCode/Enum_TypeCode.cpp:
* TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
* TAO/tao/AnyTypeCode/Struct_TypeCode.cpp:
* TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
* TAO/tao/AnyTypeCode/TypeCode.cpp:
* TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
* TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
* TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
* TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
* TAO/tao/CDR.inl:
* TAO/tao/CORBALOC_Parser.cpp:
* TAO/tao/CORBA_String.inl:
* TAO/tao/DynamicAny/DynCommon.cpp:
* TAO/tao/DynamicInterface/Request.cpp:
* TAO/tao/GIOP_Message_Generator_Parser_10.cpp:
* TAO/tao/HTTP_Handler.cpp:
* TAO/tao/IIOP_Acceptor.cpp:
* TAO/tao/IIOP_Connector.cpp:
* TAO/tao/IIOP_Endpoint.cpp:
* TAO/tao/IIOP_Profile.cpp:
* TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp:
* TAO/tao/ImR_Client/ImR_Client.cpp:
* TAO/tao/MCAST_Parser.cpp:
* TAO/tao/ORB.cpp:
* TAO/tao/ORB_Core.cpp:
* TAO/tao/Object_KeyC.cpp:
* TAO/tao/Object_Ref_Table.cpp:
* TAO/tao/PI/Interceptor_List_T.cpp:
* TAO/tao/PI/ORBInitInfo.cpp:
* TAO/tao/PortableServer/BD_String_SArgument_T.cpp:
* TAO/tao/PortableServer/PortableServer_Functions.cpp:
* TAO/tao/Strategies/COIOP_Connector.cpp:
* TAO/tao/Strategies/COIOP_Profile.cpp:
* TAO/tao/Strategies/DIOP_Acceptor.cpp:
* TAO/tao/Strategies/DIOP_Connector.cpp:
* TAO/tao/Strategies/DIOP_Endpoint.cpp:
* TAO/tao/Strategies/DIOP_Profile.cpp:
* TAO/tao/Strategies/SCIOP_Acceptor.cpp:
* TAO/tao/Strategies/SCIOP_Connector.cpp:
* TAO/tao/Strategies/SCIOP_Endpoint.cpp:
* TAO/tao/Strategies/SCIOP_Profile.cpp:
* TAO/tao/Strategies/SHMIOP_Connector.cpp:
* TAO/tao/Strategies/SHMIOP_Endpoint.cpp:
* TAO/tao/Strategies/SHMIOP_Profile.cpp:
* TAO/tao/Strategies/UIOP_Connector.cpp:
* TAO/tao/Strategies/UIOP_Profile.cpp:
* TAO/tao/String_Alloc.cpp:
* TAO/tao/TAO_Server_Request.cpp:
* TAO/tao/TAO_Server_Request.inl:
* TAO/tao/Transport_Connector.cpp:
Diffstat (limited to 'TAO/tao/CORBALOC_Parser.cpp')
-rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 810ef41d818..2ab88c2c38a 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -22,6 +22,8 @@ #include "tao/CORBALOC_Parser.inl" #endif /* __ACE_INLINE__ */ +#include <cstring> + static const char prefix[] = "corbaloc:"; static const size_t prefix_len = sizeof prefix - 1; static const char rir_token[] = "rir:"; @@ -106,7 +108,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) // Skip the prefix. We know it is there because this method is only // called if match_prefix() returns 1. - ior += ACE_OS::strlen(prefix); + ior += std::strlen(prefix); // First check for rir if (ACE_OS::strncmp (ior,rir_token,rir_token_len) == 0) @@ -116,9 +118,9 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) // most likely commas will separate endpoints, although they could be // part of an endpoint address for some protocols. size_t max_endpoint_count = 1; - for (const char *comma = ACE_OS::strchr (ior,','); + for (const char *comma = std::strchr (ior,','); comma; - comma = ACE_OS::strchr (comma+1,',')) + comma = std::strchr (comma+1,',')) ++max_endpoint_count; ACE_Array<parsed_endpoint> endpoints(max_endpoint_count); @@ -234,7 +236,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, size_t prot_addr_len, ACE_CString &canonical_endpoint) { - const char *separator = ACE_OS::strchr (ior, ':'); + const char *separator = std::strchr (ior, ':'); // A special case for handling iiop if (ior[0] != ':' && ACE_OS::strncmp (ior,iiop_token,iiop_token_len) != 0) @@ -247,7 +249,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, const char *addr_base = separator+1; const char *addr_tail = ior + prot_addr_len; // skip past version, if any - separator = ACE_OS::strchr (addr_base,'@'); + separator = std::strchr (addr_base,'@'); if (separator != nullptr && separator < addr_tail) { canonical_endpoint.set (addr_base,(separator - addr_base)+1,1); @@ -258,7 +260,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, ACE_CString raw_host; ACE_CString raw_port; - separator = ACE_OS::strchr (addr_base,':'); + separator = std::strchr (addr_base,':'); #if defined (ACE_HAS_IPV6) // IPv6 numeric address in host string? @@ -267,7 +269,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, { // In this case we have to find the end of the numeric address and // start looking for the port separator from there. - const char *cp_pos = ACE_OS::strchr(addr_base, ']'); + const char *cp_pos = std::strchr(addr_base, ']'); if (cp_pos == 0 || cp_pos >= addr_tail) { // No valid IPv6 address specified but that will come out later. |