projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added/restructured all additional hostname information
[m6w6/libmemcached]
/
lib
/
memcached_flush.c
diff --git
a/lib/memcached_flush.c
b/lib/memcached_flush.c
index 8c51cdf1f85f8e9e44d3fa7a67fb673aac42aa52..967354628ee48781996f84cbea4b71db72e7bcee 100644
(file)
--- a/
lib/memcached_flush.c
+++ b/
lib/memcached_flush.c
@@
-1,17
+1,19
@@
-#include
<memcached.h>
+#include
"common.h"
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
unsigned int x;
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
unsigned int x;
- size_t send_length;
+ size_t send_length
, sent_length
;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+ LIBMEMCACHED_MEMCACHED_FLUSH_START();
rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
+ memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
for (x= 0; x < ptr->number_of_hosts; x++)
{
if (expiration)
for (x= 0; x < ptr->number_of_hosts; x++)
{
if (expiration)
@@
-20,7
+22,13
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all\r\n");
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all\r\n");
- if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
+
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+ return MEMCACHED_WRITE_FAILURE;
+
+ sent_length= send(ptr->hosts[x].fd, buffer, send_length, 0);
+
+ if (sent_length == -1 || sent_length != send_length)
return MEMCACHED_WRITE_FAILURE;
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
return MEMCACHED_WRITE_FAILURE;
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
@@
-29,5
+37,6
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
rc= MEMCACHED_SOME_ERRORS;
}
rc= MEMCACHED_SOME_ERRORS;
}
+ LIBMEMCACHED_MEMCACHED_FLUSH_END();
return rc;
}
return rc;
}