Trying to remove dead branch

[awesomized/libmemcached] / libmemcached / memcached_io.c

diff --git a/libmemcached/memcached_io.c b/libmemcached/memcached_io.c
index 7ed2a403f58563f375c8cd04424308a4de86e0b3..0afcc29eaa4756670c25fa525b48d2fd93049fc1 100644 (file)
--- a/libmemcached/memcached_io.c
+++ b/libmemcached/memcached_io.c
@@ -220,13 +220,17 @@ ssize_t memcached_io_write(memcached_server_st *ptr,
 memcached_return memcached_io_close(memcached_server_st *ptr)
 {
   int r;
-  /* in case of death shutdown to avoid blocking at close() */
 
+  if (ptr->fd == -1)
+    return MEMCACHED_SUCCESS;
+
+  /* in case of death shutdown to avoid blocking at close() */
   r= shutdown(ptr->fd, SHUT_RDWR);
 
 #ifdef HAVE_DEBUG
   if (r && errno != ENOTCONN)
   {
+    WATCHPOINT_NUMBER(ptr->fd);
     WATCHPOINT_ERRNO(errno);
     WATCHPOINT_ASSERT(errno);
   }