X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fio.c;h=712e11afd9363f345347df0fbab12e44f06065b3;hb=0c7d432ca4a89f23caa74ff11e5a63fa9e6d3f3f;hp=8f96bc32e19975f50bc74b459e0586fff99159fc;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=m6w6%2Flibmemcached

diff --git a/libmemcached/io.c b/libmemcached/io.c
index 8f96bc32..712e11af 100644
--- a/libmemcached/io.c
+++ b/libmemcached/io.c
@@ -333,31 +333,23 @@ ssize_t memcached_io_write(memcached_server_st *ptr,
 
 memcached_return_t memcached_io_close(memcached_server_st *ptr)
 {
-  int r;
-
   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)
   {
-    r= 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);
   }
 
-  r= close(ptr->fd);
-#ifdef DEBUG
-  if (r != 0)
+  if (close(ptr->fd) == -1)
+  {
     WATCHPOINT_ERRNO(errno);
-#endif
+  }
 
   return MEMCACHED_SUCCESS;
 }