Fix -1 usage for bad socket descriptor

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index e04098c421db19d6297958d875fd967c0ae715ca..b81b25b992bf8fc57d5f7929cba9e2a4ff71b3cb 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -231,7 +231,7 @@ static inline void set_socket_nonblocking(memcached_server_st *server)
 
 static void set_socket_options(memcached_server_st *server)
 {
-  assert_msg(server->fd != -1, "invalid socket was passed to set_socket_options()");
+  assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()");
 
   if (memcached_is_udp(server->root))
   {

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index 8c8c3bc7e977231ab307822244ad350141a16709..c0671e05dabe6cfc5463d897461fbbfa78f513b3 100644 (file)
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -408,7 +408,7 @@ static ssize_t io_flush(memcached_server_write_instance_st ptr,
       default:
         memcached_quit_server(ptr, true);
         *error= memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
-        WATCHPOINT_ASSERT(ptr->fd == -1);
+        WATCHPOINT_ASSERT(ptr->fd == INVALID_SOCKET);
         return -1;
       }
     }