Fix for most errors around non-block

[m6w6/libmemcached] / libmemcached / memcached_purge.c

diff --git a/libmemcached/memcached_purge.c b/libmemcached/memcached_purge.c
index d9d43057627a58f9703771b79f885a16c66d3f89..0fbd453ca9e48d03d9cceb5c44704a2130c84d74 100644 (file)
--- a/libmemcached/memcached_purge.c
+++ b/libmemcached/memcached_purge.c
@@ -5,21 +5,22 @@
 
 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 */
       (memcached_server_response_count(ptr) < ptr->root->io_msg_watermark && 
        ptr->io_bytes_sent < ptr->root->io_bytes_watermark) ||
       (ptr->io_bytes_sent > ptr->root->io_bytes_watermark && 
-       memcached_server_response_count(ptr) < 10)) {
+       memcached_server_response_count(ptr) < 10)) 
+  {
     return;
   }
 
   /* memcached_io_write and memcached_response may call memcached_purge
      so we need to be able stop any recursion.. */
-  ptr->root->purging = 1;
+  ptr->root->purging= 1;
 
   /* Force a flush of the buffer to ensure that we don't have the n-1 pending
      requests buffered up.. */
@@ -33,10 +34,10 @@ void memcached_purge(memcached_server_st *ptr)
   
   /* memcached_response may call memcached_io_read, but let's use a short
      timeout if there is no data yet */
-  int32_t timeout = ptr->root->poll_timeout;
-  ptr->root->poll_timeout = 1;
+  timeout= ptr->root->poll_timeout;
+  ptr->root->poll_timeout= 1;
   memcached_response(ptr, buffer, sizeof(buffer), &result);
-  ptr->root->poll_timeout = timeout;
+  ptr->root->poll_timeout= timeout;
   memcached_server_response_increment(ptr);
   ptr->root->purging = 0;
 }