Bool fix.

[awesomized/libmemcached] / libmemcached / storage.c

diff --git a/libmemcached/storage.c b/libmemcached/storage.c
index c0db470ca80fd5f1b2c54890c1f334ab746e21ff..7a96b778368c98e3398c102cce69c4571064094d 100644 (file)
--- a/libmemcached/storage.c
+++ b/libmemcached/storage.c
@@ -65,7 +65,7 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
                                                 uint64_t cas,
                                                 memcached_storage_action_t verb)
 {
-  char to_write;
+  bool to_write;
   size_t write_length;
   memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@ -98,8 +98,9 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
   if (cas)
   {
     write_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
-                                    "%s %s%.*s %u %llu %zu %llu%s\r\n",
+                                    "%s %.*s%.*s %u %llu %zu %llu%s\r\n",
                                     storage_op_string(verb),
+                                    (int)ptr->prefix_key_length,
                                     ptr->prefix_key,
                                     (int)key_length, key, flags,
                                     (unsigned long long)expiration, value_length,
@@ -115,10 +116,10 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
     memcpy(buffer_ptr, command, strlen(command));
 
     /* Copy in the key prefix, switch to the buffer_ptr */
-    buffer_ptr= memcpy((buffer_ptr + strlen(command)), ptr->prefix_key, strlen(ptr->prefix_key));
+    buffer_ptr= memcpy((buffer_ptr + strlen(command)), ptr->prefix_key, ptr->prefix_key_length);
 
     /* Copy in the key, adjust point if a key prefix was used. */
-    buffer_ptr= memcpy(buffer_ptr + (ptr->prefix_key ? strlen(ptr->prefix_key) : 0),
+    buffer_ptr= memcpy(buffer_ptr + (ptr->prefix_key_length ? ptr->prefix_key_length : 0),
                        key, key_length);
     buffer_ptr+= key_length;
     buffer_ptr[0]=  ' ';
@@ -138,7 +139,7 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
     if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
       return MEMCACHED_WRITE_FAILURE;
     if (cmd_size + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
-      memcached_io_write(instance, NULL, 0, 1);
+      memcached_io_write(instance, NULL, 0, true);
   }
 
   if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
@@ -148,12 +149,12 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
   }
 
   /* Send command header */
-  rc=  memcached_do(instance, buffer, write_length, 0);
+  rc=  memcached_do(instance, buffer, write_length, false);
   if (rc != MEMCACHED_SUCCESS)
     goto error;
 
   /* Send command body */
-  if (memcached_io_write(instance, value, value_length, 0) == -1)
+  if (memcached_io_write(instance, value, value_length, false) == -1)
   {
     rc= MEMCACHED_WRITE_FAILURE;
     goto error;
@@ -161,11 +162,11 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
 
   if (ptr->flags.buffer_requests && verb == SET_OP)
   {
-    to_write= 0;
+    to_write= false;
   }
   else
   {
-    to_write= 1;
+    to_write= true;
   }
 
   if (memcached_io_write(instance, "\r\n", 2, to_write) == -1)
@@ -175,9 +176,9 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
   }
 
   if (ptr->flags.no_reply)
-    return (to_write == 0) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+    return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
 
-  if (to_write == 0)
+  if (to_write == false)
     return MEMCACHED_BUFFERED;
 
   rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
@@ -440,7 +441,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
                                                 uint64_t cas,
                                                 memcached_storage_action_t verb)
 {
-  uint8_t flush;
+  bool flush;
   protocol_binary_request_set request= {.bytes= {0}};
   size_t send_length= sizeof(request.bytes);
   uint32_t server_key= memcached_generate_hash(ptr, master_key,
@@ -470,9 +471,9 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
   if (cas)
     request.message.header.request.cas= htonll(cas);
 
-  flush= (uint8_t) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
+  flush= (bool) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
 
-  if (server->root->flags.use_udp && !flush)
+  if (server->root->flags.use_udp && ! flush)
   {
     size_t cmd_size= send_length + key_length + value_length;
 
@@ -482,14 +483,14 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
     }
     if (cmd_size + server->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
     {
-      memcached_io_write(server, NULL, 0, 1);
+      memcached_io_write(server, NULL, 0, true);
     }
   }
 
   /* write the header */
-  if ((memcached_do(server, (const char*)request.bytes, send_length, 0) != MEMCACHED_SUCCESS) ||
-      (memcached_io_write(server, key, key_length, 0) == -1) ||
-      (memcached_io_write(server, value, value_length, (char) flush) == -1))
+  if ((memcached_do(server, (const char*)request.bytes, send_length, false) != MEMCACHED_SUCCESS) ||
+      (memcached_io_write(server, key, key_length, false) == -1) ||
+      (memcached_io_write(server, value, value_length, flush) == -1))
   {
     memcached_io_reset(server);
     return MEMCACHED_WRITE_FAILURE;
@@ -510,9 +511,9 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
       instance= memcached_server_instance_fetch(ptr, server_key);
 
       if ((memcached_do(instance, (const char*)request.bytes,
-                        send_length, 0) != MEMCACHED_SUCCESS) ||
-          (memcached_io_write(instance, key, key_length, 0) == -1) ||
-          (memcached_io_write(instance, value, value_length, (char) flush) == -1))
+                        send_length, false) != MEMCACHED_SUCCESS) ||
+          (memcached_io_write(instance, key, key_length, false) == -1) ||
+          (memcached_io_write(instance, value, value_length, flush) == -1))
       {
         memcached_io_reset(instance);
       }
@@ -523,7 +524,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
     }
   }
 
-  if (flush == 0)
+  if (flush == false)
   {
     return MEMCACHED_BUFFERED;
   }