*** empty log message ***

2 files changed, 8 insertions, 9 deletions

diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index ebcf6acf924..b5864420a65 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -504,13 +504,11 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor");
   
   if (service_name != 0)
-    ACE_ALLOCATOR_RETURN (this->service_name_,
-                          ACE_OS::strdup (service_name),
-                          -1);
+    ACE_ALLOCATOR (this->service_name_,
+                   ACE_OS::strdup (service_name));
   if (service_description != 0)
-    ACE_ALLOCATOR_RETURN (this->service_description_,
-                          ACE_OS::strdup (service_description),
-                          -1);
+    ACE_ALLOCATOR (this->service_description_,
+                   ACE_OS::strdup (service_description));
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> 
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 736038c6d92..74d66e138be 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -96,13 +96,13 @@ int
 ACE_INET_Addr::string_to_addr (const char s[])
 {
   ACE_TRACE ("ACE_INET_Addr::string_to_addr");
-  // Need to make a duplicate since we'll be overwriting the string.
+  int result;
   char *t;
 
-  ACE_ALLOCATOR_RETURN (t, ACE_OS::strdup (s), -1)
+  // Need to make a duplicate since we'll be overwriting the string.
+  ACE_ALLOCATOR_RETURN (t, ACE_OS::strdup (s), -1);
 
   char *ip_addr = ACE_OS::strchr (t, ':');
-  int result;
 
   if (ip_addr == 0) // Assume it's a port number.
     {
@@ -115,6 +115,7 @@ ACE_INET_Addr::string_to_addr (const char s[])
       u_short port = (u_short) ACE_OS::atoi (ip_addr + 1); // Skip over ':'
       result = this->set (port, t);
     }
+
   ACE_OS::free (ACE_MALLOC_T (t));
   return result;
 }