X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstorage.c;h=191802ab6f48c67d012dbe8846253e422730567b;hb=f0d3a824ed9acb9f6e3080683abe2bcc8b0cd6bd;hp=782a3766790177b76867da59157d5e065e59a355;hpb=44bc9cfbcf0794de92da28d9aaaa46d62945ce4e;p=awesomized%2Flibmemcached diff --git a/libmemcached/storage.c b/libmemcached/storage.c index 782a3766..191802ab 100644 --- a/libmemcached/storage.c +++ b/libmemcached/storage.c @@ -106,12 +106,12 @@ static inline memcached_return_t memcached_send(memcached_st *ptr, { int check_length; check_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "%s %.*s%.*s %u %llu %zu %llu%s\r\n", + "%s %.*s%.*s %u %llu %lu %llu%s\r\n", storage_op_string(verb), (int)ptr->prefix_key_length, ptr->prefix_key, (int)key_length, key, flags, - (unsigned long long)expiration, value_length, + (unsigned long long)expiration, (unsigned long)value_length, (unsigned long long)cas, (ptr->flags.no_reply) ? " noreply" : ""); if (check_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || check_length < 0) @@ -144,9 +144,9 @@ static inline memcached_return_t memcached_send(memcached_st *ptr, write_length= (size_t)(buffer_ptr - buffer); int check_length; check_length= snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE -(size_t)(buffer_ptr - buffer), - "%u %llu %zu%s\r\n", + "%u %llu %lu%s\r\n", flags, - (unsigned long long)expiration, value_length, + (unsigned long long)expiration, (unsigned long)value_length, ptr->flags.no_reply ? " noreply" : ""); if ((size_t)check_length >= MEMCACHED_DEFAULT_COMMAND_SIZE -(size_t)(buffer_ptr - buffer) || check_length < 0) { @@ -310,8 +310,8 @@ memcached_return_t memcached_cas(memcached_st *ptr, } memcached_return_t memcached_set_by_key(memcached_st *ptr, - const char *master_key __attribute__((unused)), - size_t master_key_length __attribute__((unused)), + const char *master_key, + size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration,