Merge Monty

[awesomized/libmemcached] / libmemcached / io.c

diff --git a/libmemcached/io.c b/libmemcached/io.c
index 9f98b8b480cb3d32958bc39655ba835f968cbfab..712e11afd9363f345347df0fbab12e44f06065b3 100644 (file)
--- a/libmemcached/io.c
+++ b/libmemcached/io.c
@@ -333,39 +333,23 @@ ssize_t memcached_io_write(memcached_server_st *ptr,
 
 memcached_return_t memcached_io_close(memcached_server_st *ptr)
 {
-#ifdef DEBUG
-  int r;
-#endif
-
   if (ptr->fd == -1)
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   /* in case of death shutdown to avoid blocking at close() */
-  if (1)
+  if (shutdown(ptr->fd, SHUT_RDWR) == -1 && errno != ENOTCONN)
   {
-#ifdef DEBUG
-    r=
-#endif
-      shutdown(ptr->fd, SHUT_RDWR);
-
-#ifdef DEBUG
-    if (r && errno != ENOTCONN)
-    {
-      WATCHPOINT_NUMBER(ptr->fd);
-      WATCHPOINT_ERRNO(errno);
-      WATCHPOINT_ASSERT(errno);
-    }
-#endif
+    WATCHPOINT_NUMBER(ptr->fd);
+    WATCHPOINT_ERRNO(errno);
+    WATCHPOINT_ASSERT(errno);
   }
 
-#ifdef DEBUG
-  r=
-#endif
-    close(ptr->fd);
-#ifdef DEBUG
-  if (r != 0)
+  if (close(ptr->fd) == -1)
+  {
     WATCHPOINT_ERRNO(errno);
-#endif
+  }
 
   return MEMCACHED_SUCCESS;
 }