projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Committing work for next release (got to do something over lunch aye?)
[m6w6/libmemcached]
/
lib
/
memcached_flush.c
diff --git
a/lib/memcached_flush.c
b/lib/memcached_flush.c
index af2303ca6d41a3657ad5a0ad3c4bbe5a8f753953..5fa5d960264ed02a54e4a83777104b5f612d759a 100644
(file)
--- a/
lib/memcached_flush.c
+++ b/
lib/memcached_flush.c
@@
-8,13
+8,8
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
LIBMEMCACHED_MEMCACHED_FLUSH_START();
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
LIBMEMCACHED_MEMCACHED_FLUSH_START();
- rc= memcached_connect(ptr, 0);
-
- if (rc == MEMCACHED_NO_SERVERS)
- return rc;
-
- if (rc != MEMCACHED_SUCCESS)
- rc= MEMCACHED_SOME_ERRORS;
+ if (ptr->number_of_hosts == 0)
+ return MEMCACHED_NO_SERVERS;
for (x= 0; x < ptr->number_of_hosts; x++)
{
for (x= 0; x < ptr->number_of_hosts; x++)
{
@@
-25,20
+20,12
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all\r\n");
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all\r\n");
- if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
- return MEMCACHED_WRITE_FAILURE;
-
rc= memcached_do(ptr, x, buffer, send_length, 1);
rc= memcached_do(ptr, x, buffer, send_length, 1);
- if (rc != MEMCACHED_SUCCESS)
- goto error;
-
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
- if (rc
!
= MEMCACHED_SUCCESS)
-
rc= MEMCACHED_SOME_ERRORS
;
+ if (rc
=
= MEMCACHED_SUCCESS)
+
(void)memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x)
;
}
}
-error:
LIBMEMCACHED_MEMCACHED_FLUSH_END();
LIBMEMCACHED_MEMCACHED_FLUSH_END();
- return
rc
;
+ return
MEMCACHED_SUCCESS
;
}
}