X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fget.c;h=7cb5ec0473a02dee239104d60ed32b92403e8bb0;hb=8dbf5dfc11d59551dbe433dc45e8c1283cbd939a;hp=876389bf7f454d0f4b04ce7926920686ef75c62e;hpb=05d5ad2cd0a4ae9e8c70ae031d4639691083765c;p=m6w6%2Flibmemcached

diff --git a/libmemcached/get.c b/libmemcached/get.c
index 876389bf..7cb5ec04 100644
--- a/libmemcached/get.c
+++ b/libmemcached/get.c
@@ -232,7 +232,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
     struct libmemcached_io_vector_st vector[]=
     {
       { .length= get_command_length, .buffer= get_command },
-      { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+      { .length= memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key) },
       { .length= key_length[x], .buffer= keys[x] },
       { .length= 1, .buffer= " " }
     };
@@ -250,7 +250,6 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
 
       if ((memcached_io_writev(instance, vector, 4, false)) == -1)
       {
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         failures_occured_in_sending= true;
         continue;
       }
@@ -263,7 +262,6 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       if ((memcached_io_writev(instance, (vector + 1), 3, false)) == -1)
       {
         memcached_server_response_reset(instance);
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         failures_occured_in_sending= true;
         continue;
       }
@@ -295,7 +293,6 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       /* We need to do something about non-connnected hosts in the future */
       if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
       {
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         failures_occured_in_sending= true;
       }
       else
@@ -377,7 +374,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
 {
   memcached_return_t rc= MEMCACHED_NOTFOUND;
 
-  int flush= number_of_keys == 1;
+  bool flush= (number_of_keys == 1);
 
   /*
     If a server fails we warn about errors and start all over with sending keys
@@ -426,21 +423,20 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
       return vk;
     }
 
-    request.message.header.request.keylen= htons((uint16_t)(key_length[x] + ptr->prefix_key_length));
+    request.message.header.request.keylen= htons((uint16_t)(key_length[x] + memcached_array_size(ptr->prefix_key)));
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-    request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + ptr->prefix_key_length));
+    request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + memcached_array_size(ptr->prefix_key)));
 
     struct libmemcached_io_vector_st vector[]=
     {
       { .length= sizeof(request.bytes), .buffer= request.bytes },
-      { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+      { .length= memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key) },
       { .length= key_length[x], .buffer= keys[x] }
     };
 
     if (memcached_io_writev(instance, vector, 3, flush) == -1)
     {
       memcached_server_response_reset(instance);
-      fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
       rc= MEMCACHED_SOME_ERRORS;
       continue;
     }
@@ -450,7 +446,6 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     memcached_server_response_increment(instance);
     if ((x > 0 && x == ptr->io_key_prefetch) && memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS)
     {
-      fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
       rc= MEMCACHED_SOME_ERRORS;
     }
   }
@@ -476,7 +471,6 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
         {
           memcached_server_response_reset(instance);
           memcached_io_reset(instance);
-          fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           rc= MEMCACHED_SOME_ERRORS;
         }
 
@@ -485,7 +479,6 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
         {
           memcached_server_response_reset(instance);
           memcached_io_reset(instance);
-          fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           rc= MEMCACHED_SOME_ERRORS;
         }
       }
@@ -552,9 +545,9 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
         .message.header.request= {
           .magic= PROTOCOL_BINARY_REQ,
           .opcode= PROTOCOL_BINARY_CMD_GETK,
-          .keylen= htons((uint16_t)(key_length[x] + ptr->prefix_key_length)),
+          .keylen= htons((uint16_t)(key_length[x] + memcached_array_size(ptr->prefix_key))),
           .datatype= PROTOCOL_BINARY_RAW_BYTES,
-          .bodylen= htonl((uint32_t)(key_length[x] + ptr->prefix_key_length))
+          .bodylen= htonl((uint32_t)(key_length[x] + memcached_array_size(ptr->prefix_key)))
         }
       };
 
@@ -571,7 +564,7 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
       struct libmemcached_io_vector_st vector[]=
       {
         { .length= sizeof(request.bytes), .buffer= request.bytes },
-        { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+        { .length= memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key) },
         { .length= key_length[x], .buffer= keys[x] }
       };