[tor-commits] [tor/maint-0.2.4] Use SOCKET_OK/TOR_INVALID_SOCKET in socketpair replacement code

[nickm at torproject.org]

commit 031e695aa50f24000ec112d535636807167be436
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 6 16:41:53 2013 -0400

    Use SOCKET_OK/TOR_INVALID_SOCKET in socketpair replacement code
---
 src/common/compat.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 69eb064..bf6a0a4 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1225,9 +1225,9 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
      * for now, and really, when localhost is down sometimes, we
      * have other problems too.
      */
-    tor_socket_t listener = -1;
-    tor_socket_t connector = -1;
-    tor_socket_t acceptor = -1;
+    tor_socket_t listener = TOR_INVALID_SOCKET;
+    tor_socket_t connector = TOR_INVALID_SOCKET;
+    tor_socket_t acceptor = TOR_INVALID_SOCKET;
     struct sockaddr_in listen_addr;
     struct sockaddr_in connect_addr;
     int size;
@@ -1306,11 +1306,11 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
   tidy_up_and_fail:
     if (saved_errno < 0)
       saved_errno = errno;
-    if (listener != -1)
+    if (SOCKET_OK(listener))
       tor_close_socket(listener);
-    if (connector != -1)
+    if (SOCKET_OK(connector))
       tor_close_socket(connector);
-    if (acceptor != -1)
+    if (SOCKET_OK(acceptor))
       tor_close_socket(acceptor);
     return -saved_errno;
 #endif