projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Adding new memcached_clone() function
[m6w6/libmemcached]
/
lib
/
memcached_delete.c
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index ff085453ab63a0fc602df81205b3348c59ddd118..6a8495335e17a10e5f30aa167043efe6ba5e9431 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-3,6
+3,7
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
time_t expiration)
{
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length,
time_t expiration)
{
+ char to_write;
size_t send_length, sent_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
size_t send_length, sent_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@
-30,18
+31,29
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
goto error;
}
goto error;
}
- sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1);
+ if ((ptr->flags & MEM_NO_BLOCK))
+ to_write= 0;
+ else
+ to_write= 1;
- if (
sent_length == -1 || sent_length != send_length
)
+ if (
(sent_length= memcached_io_write(ptr, server_key, buffer, send_length, to_write)) == -1
)
{
{
+ memcached_quit_server(ptr, server_key);
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
-
- if (rc == MEMCACHED_DELETED)
+ if ((ptr->flags & MEM_NO_BLOCK))
+ {
rc= MEMCACHED_SUCCESS;
rc= MEMCACHED_SUCCESS;
+ memcached_server_response_increment(ptr, server_key);
+ }
+ else
+ {
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+ }
LIBMEMCACHED_MEMCACHED_DELETE_END();
LIBMEMCACHED_MEMCACHED_DELETE_END();