Merge.

diff --git a/libmemcached/jenkins_hash.c b/libmemcached/jenkins_hash.c
index 55b52709588314a796ecd192c165f1fb8b8a626b..940e4718c0810ae976a85e822383269ddbc4e6be 100644 (file)
--- a/libmemcached/jenkins_hash.c
+++ b/libmemcached/jenkins_hash.c
@@ -65,7 +65,6 @@ uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval)
   u.ptr = key;
   if ((u.i & 0x3) == 0) {
     const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-    const uint8_t  *k8;
 
     /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
     while (length > 12)

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index 2b392fb6138528361abb5836f9e3d628fcface76..57bce10107255bbef5c00a3506b6fd9c7a2a709d 100644 (file)
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -184,8 +184,6 @@ static memcached_return network_connect(memcached_server_st *ptr)
           return MEMCACHED_FAILURE;
       }
     }
-    /* Old connection junk still is in the structure */
-    WATCHPOINT_ASSERT(ptr->cursor_active == 0);
 
     if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED || 
         (!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))

diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c
index 79e88701f63b66871b7753dea54fa84c9019ce79..34bbf68941b055253c8101680e95c74c9f2c30c7 100644 (file)
--- a/libmemcached/memcached_hosts.c
+++ b/libmemcached/memcached_hosts.c
@@ -361,9 +361,10 @@ memcached_return memcached_server_remove(memcached_server_st *st_ptr)
 
   for (x= 0, index= 0; x < ptr->number_of_hosts; x++) 
   {
-    if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH)!=0 || list[x].port != st_ptr->port) 
+    if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port) 
     {
-      memcpy(list+index, list+x, sizeof(memcached_server_st));
+      if (index != x)
+        memcpy(list+index, list+x, sizeof(memcached_server_st));
       index++;
     } 
   }

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);
   }

diff --git a/libmemcached/memcached_purge.c b/libmemcached/memcached_purge.c
index 749a30d6c19d85891fd8a69aed1b8f5dfaffa4b4..0fbd453ca9e48d03d9cceb5c44704a2130c84d74 100644 (file)
--- a/libmemcached/memcached_purge.c
+++ b/libmemcached/memcached_purge.c
@@ -7,7 +7,6 @@ void memcached_purge(memcached_server_st *ptr)
 {
   int32_t timeout;
   char buffer[2048];
-  size_t buffer_length= sizeof(buffer);
   memcached_result_st result;
 
   if (ptr->root->purging || /* already purging */