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;
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;
}