projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Switching to pointer for read (mainly getting ready to do optimization)
[m6w6/libmemcached]
/
lib
/
memcached_delete.c
diff --git
a/lib/memcached_delete.c
b/lib/memcached_delete.c
index 75087bd491b3c65a397ed798427fc920ae5c052b..ecd7d8dc1b203cad509f1616939981b1b0a1a48a 100644
(file)
--- a/
lib/memcached_delete.c
+++ b/
lib/memcached_delete.c
@@
-1,4
+1,4
@@
-#include
<memcached.h>
+#include
"common.h"
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)
@@
-8,6
+8,8
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
+ LIBMEMCACHED_MEMCACHED_DELETE_START();
+
rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
@@
-24,22
+26,26
@@
memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_lengt
"delete %.*s\r\n", (int)key_length, key);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
"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, "error %s: write: %m\n", __FUNCTION__)
;
-
return MEMCACHED_WRITE_FAILURE
;
+
rc= MEMCACHED_WRITE_FAILURE
;
+
goto error
;
}
}
- if (sent_length != send_length)
+ sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
+
+ if (sent_length == -1 || sent_length != send_length)
{
{
- fprintf(stderr, "error %s: short write %d %d: %m\n",
- __FUNCTION__, sent_length, send_length);
- return MEMCACHED_WRITE_FAILURE;
+ rc= MEMCACHED_WRITE_FAILURE;
+ goto error;
}
}
- return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+ rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
+
+ if (rc == MEMCACHED_DELETED)
+ rc= MEMCACHED_SUCCESS;
+
+ LIBMEMCACHED_MEMCACHED_DELETE_END();
+
+error:
+ return rc;
}
}