projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all current libmemcached work, plus restore older, working,
[awesomized/libmemcached]
/
libmemcached
/
version.c
diff --git
a/libmemcached/version.c
b/libmemcached/version.c
index 8fcc11a0fb6b95b2ed95eedd17a9a69735f768f3..82de87d362240666b2134ee50b802c56b7e99952 100644
(file)
--- a/
libmemcached/version.c
+++ b/
libmemcached/version.c
@@
-13,18
+13,13
@@
memcached_return_t memcached_version(memcached_st *ptr)
if (ptr->flags.use_udp)
return MEMCACHED_NOT_SUPPORTED;
if (ptr->flags.use_udp)
return MEMCACHED_NOT_SUPPORTED;
- bool was_blocking= ptr->flags.no_block;
memcached_return_t rc;
memcached_return_t rc;
- ptr->flags.no_block= false;
-
if (ptr->flags.binary_protocol)
rc= memcached_version_binary(ptr);
else
rc= memcached_version_textual(ptr);
if (ptr->flags.binary_protocol)
rc= memcached_version_binary(ptr);
else
rc= memcached_version_textual(ptr);
- ptr->flags.no_block= was_blocking;
-
return rc;
}
return rc;
}
@@
-36,7
+31,7
@@
static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
char *response_ptr;
const char *command= "version\r\n";
char *response_ptr;
const char *command= "version\r\n";
- send_length= s
trlen(command)
;
+ send_length= s
izeof("version\r\n") -1
;
rc= MEMCACHED_SUCCESS;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
rc= MEMCACHED_SUCCESS;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)