projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
libmemcached: fix a reallocation crash
[awesomized/libmemcached]
/
libmemcached
/
version.cc
diff --git
a/libmemcached/version.cc
b/libmemcached/version.cc
index 514f81080e135dff2a48137d0492f8d90b13cc0e..5f07491285cd27b120446f841a1a55036c12980d 100644
(file)
--- a/
libmemcached/version.cc
+++ b/
libmemcached/version.cc
@@
-41,7
+41,7
@@
const char * memcached_lib_version(void)
return LIBMEMCACHED_VERSION_STRING;
}
return LIBMEMCACHED_VERSION_STRING;
}
-static inline memcached_return_t memcached_version_textual(
memcached_st
*memc)
+static inline memcached_return_t memcached_version_textual(
Memcached
*memc)
{
libmemcached_io_vector_st vector[]=
{
{
libmemcached_io_vector_st vector[]=
{
@@
-52,7
+52,7
@@
static inline memcached_return_t memcached_version_textual(memcached_st *memc)
bool errors_happened= false;
for (uint32_t x= 0; x < memcached_server_count(memc); x++)
{
bool errors_happened= false;
for (uint32_t x= 0; x < memcached_server_count(memc); x++)
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(memc, x);
+
memcached_instance_st
* instance= memcached_instance_fetch(memc, x);
// Optimization, we only fetch version once.
if (instance->major_version != UINT8_MAX)
// Optimization, we only fetch version once.
if (instance->major_version != UINT8_MAX)
@@
-73,7
+73,7
@@
static inline memcached_return_t memcached_version_textual(memcached_st *memc)
if (success)
{
// Collect the returned items
if (success)
{
// Collect the returned items
-
org::libmemcached::Instance
* instance;
+
memcached_instance_st
* instance;
memcached_return_t readable_error;
while ((instance= memcached_io_get_readable_server(memc, readable_error)))
{
memcached_return_t readable_error;
while ((instance= memcached_io_get_readable_server(memc, readable_error)))
{
@@
-89,7
+89,7
@@
static inline memcached_return_t memcached_version_textual(memcached_st *memc)
return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
}
return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
}
-static inline memcached_return_t memcached_version_binary(
memcached_st
*memc)
+static inline memcached_return_t memcached_version_binary(
Memcached
*memc)
{
protocol_binary_request_version request= {};
{
protocol_binary_request_version request= {};
@@
-105,7
+105,7
@@
static inline memcached_return_t memcached_version_binary(memcached_st *memc)
bool errors_happened= false;
for (uint32_t x= 0; x < memcached_server_count(memc); x++)
{
bool errors_happened= false;
for (uint32_t x= 0; x < memcached_server_count(memc); x++)
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(memc, x);
+
memcached_instance_st
* instance= memcached_instance_fetch(memc, x);
initialize_binary_request(instance, request.message.header);
initialize_binary_request(instance, request.message.header);
@@
-128,7
+128,7
@@
static inline memcached_return_t memcached_version_binary(memcached_st *memc)
if (success)
{
// Collect the returned items
if (success)
{
// Collect the returned items
-
org::libmemcached::Instance
* instance;
+
memcached_instance_st
* instance;
memcached_return_t readable_error;
while ((instance= memcached_io_get_readable_server(memc, readable_error)))
{
memcached_return_t readable_error;
while ((instance= memcached_io_get_readable_server(memc, readable_error)))
{
@@
-145,7
+145,7
@@
static inline memcached_return_t memcached_version_binary(memcached_st *memc)
return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
}
return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
}
-static inline void version_ascii_instance(
org::libmemcached::Instance
* instance)
+static inline void version_ascii_instance(
memcached_instance_st
* instance)
{
if (instance->major_version != UINT8_MAX)
{
{
if (instance->major_version != UINT8_MAX)
{
@@
-158,7
+158,7
@@
static inline void version_ascii_instance(org::libmemcached::Instance* instance)
}
}
}
}
-static inline void version_binary_instance(
org::libmemcached::Instance
* instance)
+static inline void version_binary_instance(
memcached_instance_st
* instance)
{
if (instance->major_version != UINT8_MAX)
{
{
if (instance->major_version != UINT8_MAX)
{
@@
-178,7
+178,7
@@
static inline void version_binary_instance(org::libmemcached::Instance* instance
}
}
}
}
-void memcached_version_instance(
org::libmemcached::Instance
* instance)
+void memcached_version_instance(
memcached_instance_st
* instance)
{
if (instance)
{
{
if (instance)
{
@@
-202,8
+202,9
@@
void memcached_version_instance(org::libmemcached::Instance* instance)
}
}
}
}
-memcached_return_t memcached_version(memcached_st *
memc
)
+memcached_return_t memcached_version(memcached_st *
shell
)
{
{
+ Memcached* memc= memcached2Memcached(shell);
if (memc)
{
memcached_return_t rc;
if (memc)
{
memcached_return_t rc;