X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=499fb7c8e947e18f76e5fda784a5c2a90d361534;hb=ccd00450d57624afba24bfbb6e76d1d69d0ad0f8;hp=3df4913ad10fb23cb06d9b61a9c0ef4246bd3ec6;hpb=3efc2e6fb6a17e8eb52dbe3590a5dcb063b30537;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 3df4913a..499fb7c8 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -16,43 +16,44 @@ static memcached_return memcached_send(memcached_st *ptr,
                                        uint16_t  flags,
                                        char *verb)
 {
-  size_t send_length;
+  size_t write_length;
+  ssize_t sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  rc= memcached_connect(ptr);
+  assert(value);
+  assert(value_length);
 
+  rc= memcached_connect(ptr);
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
   server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
 
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%s %.*s %u %u %u\r\n", verb,
-                        key_length, key, flags, expiration, value_length);
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
-  {
-    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
-
+  write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+                        "%s %.*s %x %llu %zu\r\n", verb,
+                        (int)key_length, key, flags, 
+                        (unsigned long long)expiration, value_length);
+  if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
-  }
+  if ((sent_length= send(ptr->hosts[server_key].fd, buffer, write_length, 0)) == -1)
+    return MEMCACHED_WRITE_FAILURE;
+  assert(write_length == sent_length);
 
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%.*s\r\n", 
-                        value_length, value);
-  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
-  {
-    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
+  if ((sent_length= send(ptr->hosts[server_key].fd, value, value_length, 0)) == -1)
+    return MEMCACHED_WRITE_FAILURE;
+  assert(value_length == sent_length);
 
+  if ((sent_length= send(ptr->hosts[server_key].fd, "\r\n", 2, 0)) == -1)
     return MEMCACHED_WRITE_FAILURE;
-  }
-  
-  send_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  assert(2 == sent_length);
+
+  sent_length= recv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0);
 
-  if (send_length && buffer[0] == 'S')  /* STORED */
+  if (sent_length && buffer[0] == 'S')  /* STORED */
     return MEMCACHED_SUCCESS;
-  else if (send_length && buffer[0] == 'N')  /* NOT_STORED */
+  else if (write_length && buffer[0] == 'N')  /* NOT_STORED */
     return MEMCACHED_NOTSTORED;
   else
     return MEMCACHED_READ_FAILURE;