X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_delete.c;h=75087bd491b3c65a397ed798427fc920ae5c052b;hb=557de9b08007dd2b482778ba934574bcf7ee531f;hp=e601e6fa969fca32cbb4a6e9c879edb6215cec75;hpb=3efc2e6fb6a17e8eb52dbe3590a5dcb063b30537;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_delete.c b/lib/memcached_delete.c
index e601e6fa..75087bd4 100644
--- a/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@ -3,7 +3,7 @@
 memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
                                   time_t expiration)
 {
-  size_t send_length;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
@@ -17,14 +17,27 @@ memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
 
   if (expiration)
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                          "delete %.*s %u\r\n", key_length, key, expiration);
+                          "delete %.*s %llu\r\n", (int)key_length, key, 
+                          (unsigned long long)expiration);
   else
     send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                          "delete %.*s\r\n", key_length, key);
-  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
+                          "delete %.*s\r\n", (int)key_length, key);
+
+  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+    return MEMCACHED_WRITE_FAILURE;
+
+  sent_length= write(ptr->hosts[server_key].fd, buffer, send_length);
+
+  if (sent_length == -1)
   {
-    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
+    fprintf(stderr, "error %s: write: %m\n", __FUNCTION__);
+    return MEMCACHED_WRITE_FAILURE;
+  }
 
+  if (sent_length != send_length)
+  {
+    fprintf(stderr, "error %s: short write %d %d: %m\n",
+	    __FUNCTION__, sent_length, send_length);
     return MEMCACHED_WRITE_FAILURE;
   }