projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge trunk.
[awesomized/libmemcached]
/
libmemcached
/
delete.cc
diff --git
a/libmemcached/delete.cc
b/libmemcached/delete.cc
index e473851744fdeeacac1a9712acdf5bd93d25042f..de4a53dc46a51931b3ce96e84f271ed0d3f13d36 100644
(file)
--- a/
libmemcached/delete.cc
+++ b/
libmemcached/delete.cc
@@
-134,7
+134,7
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
}
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s%.*s %u%s\r\n",
}
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s%.*s %u%s\r\n",
- memcached_print_array(ptr->
prefix_key
),
+ memcached_print_array(ptr->
_namespace
),
(int) key_length, key,
(uint32_t)expiration,
no_reply ? " noreply" :"" );
(int) key_length, key,
(uint32_t)expiration,
no_reply ? " noreply" :"" );
@@
-144,13
+144,14
@@
memcached_return_t memcached_delete_by_key(memcached_st *ptr,
{
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s%.*s%s\r\n",
{
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"delete %.*s%.*s%s\r\n",
- memcached_print_array(ptr->
prefix_key
),
+ memcached_print_array(ptr->
_namespace
),
(int)key_length, key, no_reply ? " noreply" :"");
}
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
{
(int)key_length, key, no_reply ? " noreply" :"");
}
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
{
- rc= MEMCACHED_WRITE_FAILURE;
+ rc= memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT,
+ memcached_literal_param("snprintf(MEMCACHED_DEFAULT_COMMAND_SIZE)"));
goto error;
}
goto error;
}
@@
-208,9
+209,9
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
{
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
}
{
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETE;
}
- request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->
prefix_key
)));
+ request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->
_namespace
)));
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->
prefix_key
)));
+ request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->
_namespace
)));
if (ptr->flags.use_udp && ! flush)
{
if (ptr->flags.use_udp && ! flush)
{
@@
-225,7
+226,7
@@
static inline memcached_return_t binary_delete(memcached_st *ptr,
struct libmemcached_io_vector_st vector[]=
{
{ sizeof(request.bytes), request.bytes},
struct libmemcached_io_vector_st vector[]=
{
{ sizeof(request.bytes), request.bytes},
- { memcached_array_size(ptr->
prefix_key), memcached_array_string(ptr->prefix_key
) },
+ { memcached_array_size(ptr->
_namespace), memcached_array_string(ptr->_namespace
) },
{ key_length, key },
};
{ key_length, key },
};