First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached_flush.c

diff --git a/libmemcached/memcached_flush.c b/libmemcached/memcached_flush.c
index 1011b3f18a3e908233254b7dac9089b9bf36c107..d05d744215b9ffbb3129ed71931d475f5922f6cb 100644 (file)
--- a/libmemcached/memcached_flush.c
+++ b/libmemcached/memcached_flush.c
@@ -1,16 +1,16 @@
 #include "common.h"
 
-static memcached_return memcached_flush_binary(memcached_st *ptr, 
-                                               time_t expiration);
-static memcached_return memcached_flush_textual(memcached_st *ptr, 
-                                                time_t expiration);
+static memcached_return_t memcached_flush_binary(memcached_st *ptr, 
+                                                 time_t expiration);
+static memcached_return_t memcached_flush_textual(memcached_st *ptr, 
+                                                  time_t expiration);
 
-memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
+memcached_return_t memcached_flush(memcached_st *ptr, time_t expiration)
 {
-  memcached_return rc;
+  memcached_return_t rc;
 
   LIBMEMCACHED_MEMCACHED_FLUSH_START();
-  if (ptr->flags & MEM_BINARY_PROTOCOL)
+  if (ptr->flags.binary_protocol)
     rc= memcached_flush_binary(ptr, expiration);
   else
     rc= memcached_flush_textual(ptr, expiration);
@@ -18,12 +18,12 @@ memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
   return rc;
 }
 
-static memcached_return memcached_flush_textual(memcached_st *ptr, 
-                                                time_t expiration)
+static memcached_return_t memcached_flush_textual(memcached_st *ptr, 
+                                                  time_t expiration)
 {
   unsigned int x;
   size_t send_length;
-  memcached_return rc;
+  memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
   unlikely (ptr->number_of_hosts == 0)
@@ -31,7 +31,8 @@ static memcached_return memcached_flush_textual(memcached_st *ptr,
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    bool no_reply= (ptr->flags & MEM_NOREPLY);
+    bool no_reply= ptr->flags.no_reply;
+
     if (expiration)
       send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                                      "flush_all %llu%s\r\n",
@@ -49,8 +50,8 @@ static memcached_return memcached_flush_textual(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-static memcached_return memcached_flush_binary(memcached_st *ptr, 
-                                               time_t expiration)
+static memcached_return_t memcached_flush_binary(memcached_st *ptr, 
+                                                 time_t expiration)
 {
   unsigned int x;
   protocol_binary_request_flush request= {.bytes= {0}};
@@ -67,7 +68,7 @@ static memcached_return memcached_flush_binary(memcached_st *ptr,
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if (ptr->flags & MEM_NOREPLY)
+    if (ptr->flags.no_reply)
       request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSHQ;
     else
       request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSH;
@@ -82,7 +83,7 @@ static memcached_return memcached_flush_binary(memcached_st *ptr,
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     if (memcached_server_response_count(&ptr->hosts[x]) > 0)
-       (void)memcached_response(&ptr->hosts[x], NULL, 0, NULL);
+      (void)memcached_response(&ptr->hosts[x], NULL, 0, NULL);
   }
 
   return MEMCACHED_SUCCESS;