(get_remote_addr): use ACE_NOTSUP_RETURN if ! ACE_HAS_SVR4_TLI. Declare and set local "name" only if ACE_HAS_SVR4_TLI.

1 files changed, 15 insertions, 17 deletions

diff --git a/ace/TLI_Stream.cpp b/ace/TLI_Stream.cpp
index ed32039f151..bc9b1c3b7c5 100644
--- a/ace/TLI_Stream.cpp
+++ b/ace/TLI_Stream.cpp
@@ -1,8 +1,7 @@
-// TLI_Stream.cpp
 // $Id$
 
 /* Defines the member functions for the base class of the ACE_TLI_Stream
-   abstraction. */ 
+   abstraction. */
 
 #define ACE_BUILD_DLL
 #include "ace/TLI_Stream.h"
@@ -26,26 +25,25 @@ int
 ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const
 {
   ACE_TRACE ("ACE_TLI_Stream::get_remote_addr");
-  struct netbuf name;
 
+#if defined (ACE_HAS_SVR4_TLI)
+  struct netbuf name;
   name.maxlen = sa.get_size ();
   name.buf    = (char *) sa.get_addr ();
-  
-#if defined (ACE_HAS_SVR4_TLI)
-  if (ACE_OS::ioctl (this->get_handle (), TI_GETPEERNAME, &name) == -1) 
-/*  if (ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME) == -1) */
 
-#else /* SunOS4 sucks... */
-  if (0)
-#endif /* ACE_HAS_SVR4_TLI */  
+  if (ACE_OS::ioctl (this->get_handle (), TI_GETPEERNAME, &name) == -1)
+/*  if (ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME) == -1) */
     return -1;
   else
     return 0;
+#else /* SunOS4 sucks... */
+  ACE_NOTSUP_RETURN (-1);
+#endif /* ACE_HAS_SVR4_TLI */
 }
 
 /* Send a release and then await the release from the other side */
 
-int 
+int
 ACE_TLI_Stream::active_close (void)
 {
   ACE_TRACE ("ACE_TLI_Stream::active_close");
@@ -56,12 +54,12 @@ ACE_TLI_Stream::active_close (void)
   if (this->recv (&buf, sizeof buf) == ACE_INVALID_HANDLE)
     {
       if (t_errno == TLOOK && this->look () == T_ORDREL)
-	{
-	  if (this->rcvrel () == ACE_INVALID_HANDLE)
-	    return ACE_INVALID_HANDLE;
-	}
+        {
+          if (this->rcvrel () == ACE_INVALID_HANDLE)
+            return ACE_INVALID_HANDLE;
+        }
       else
-	return ACE_INVALID_HANDLE;
+        return ACE_INVALID_HANDLE;
     }
   return this->close ();
 }
@@ -69,7 +67,7 @@ ACE_TLI_Stream::active_close (void)
 /* Acknowledge the release from the other side and then send the release to
    the other side. */
 
-int 
+int
 ACE_TLI_Stream::passive_close (void)
 {
   ACE_TRACE ("ACE_TLI_Stream::passive_close");