projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Refactored all of the IO commands to pass only server structures (this is an
[m6w6/libmemcached]
/
lib
/
memcached_verbosity.c
diff --git
a/lib/memcached_verbosity.c
b/lib/memcached_verbosity.c
index bb4f68c06ecd13c2fd1ada0681a0b743fdb1a0c7..f599787bd070697c011bf566224b210348b33e34 100644
(file)
--- a/
lib/memcached_verbosity.c
+++ b/
lib/memcached_verbosity.c
@@
-1,4
+1,4
@@
-#include
<memcached.h>
+#include
"common.h"
memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
{
memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
{
@@
-7,28
+7,25
@@
memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- rc= memcached_connect(ptr);
-
- if (rc != MEMCACHED_SUCCESS)
- rc= MEMCACHED_SOME_ERRORS;
-
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"verbosity %u\r\n", verbosity);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"verbosity %u\r\n", verbosity);
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+ return MEMCACHED_WRITE_FAILURE;
+ rc= MEMCACHED_SUCCESS;
for (x= 0; x < ptr->number_of_hosts; x++)
{
for (x= 0; x < ptr->number_of_hosts; x++)
{
- memcached_return rc;
+ memcached_return r
r
c;
- if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
+ rrc= memcached_do(&ptr->hosts[x], buffer, send_length, 1);
+ if (rrc != MEMCACHED_SUCCESS)
{
{
- fprintf(stderr, "failed verbosity\n");
-
- return MEMCACHED_WRITE_FAILURE;
+ rc= MEMCACHED_SOME_ERRORS;
+ continue;
}
}
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
-
- if (rc != MEMCACHED_SUCCESS)
+ rrc= memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+ if (rrc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
}
rc= MEMCACHED_SOME_ERRORS;
}