Bunch of fixes related to portability.

[m6w6/libmemcached] / lib / memcached_storage.c

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 5c34a57347dfd6854e418263cd7464d2954d8775..499fb7c8e947e18f76e5fda784a5c2a90d361534 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -22,45 +22,34 @@ static memcached_return memcached_send(memcached_st *ptr,
   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;
 
   write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%s %.*s %u %u %u\r\n", verb,
-                        key_length, key, flags, expiration, value_length);
-  if ((sent_length= write(ptr->hosts[server_key].fd, buffer, write_length)) == -1)
-  {
-    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
-
+                        "%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);
 
-  WATCHPOINT;
-  printf("About to push %.*s\n", value_length, value);
-  WATCHPOINT;
-  if ((sent_length= write(ptr->hosts[server_key].fd, value, value_length)) == -1)
-  {
-    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
-
+  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= write(ptr->hosts[server_key].fd, "\r\n", 2)) == -1)
-  {
-    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
 
+  if ((sent_length= send(ptr->hosts[server_key].fd, "\r\n", 2, 0)) == -1)
     return MEMCACHED_WRITE_FAILURE;
-  }
   assert(2 == sent_length);
 
-  sent_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  sent_length= recv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0);
 
   if (sent_length && buffer[0] == 'S')  /* STORED */
     return MEMCACHED_SUCCESS;