projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: fix failure tests
[awesomized/libmemcached]
/
libmemcached
/
version.cc
diff --git
a/libmemcached/version.cc
b/libmemcached/version.cc
index e9a54050977de0843004f1e3e41dcc196d0f9c86..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 *ptr
)
+static inline memcached_return_t memcached_version_textual(
Memcached *memc
)
{
libmemcached_io_vector_st vector[]=
{
{
libmemcached_io_vector_st vector[]=
{
@@
-50,9
+50,9
@@
static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
uint32_t success= 0;
bool errors_happened= false;
uint32_t success= 0;
bool errors_happened= false;
- for (uint32_t x= 0; x < memcached_server_count(
ptr
); x++)
+ for (uint32_t x= 0; x < memcached_server_count(
memc
); x++)
{
{
-
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr
, 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,8
+73,9
@@
static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
if (success)
{
// Collect the returned items
if (success)
{
// Collect the returned items
- org::libmemcached::Instance* instance;
- while ((instance= memcached_io_get_readable_server(ptr)))
+ memcached_instance_st* instance;
+ memcached_return_t readable_error;
+ while ((instance= memcached_io_get_readable_server(memc, readable_error)))
{
memcached_return_t rrc= memcached_response(instance, NULL);
if (memcached_failed(rrc))
{
memcached_return_t rrc= memcached_response(instance, NULL);
if (memcached_failed(rrc))
@@
-88,7
+89,7
@@
static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
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 *ptr
)
+static inline memcached_return_t memcached_version_binary(
Memcached *memc
)
{
protocol_binary_request_version request= {};
{
protocol_binary_request_version request= {};
@@
-102,9
+103,9
@@
static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
uint32_t success= 0;
bool errors_happened= false;
uint32_t success= 0;
bool errors_happened= false;
- for (uint32_t x= 0; x < memcached_server_count(
ptr
); x++)
+ for (uint32_t x= 0; x < memcached_server_count(
memc
); x++)
{
{
-
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr
, x);
+
memcached_instance_st* instance= memcached_instance_fetch(memc
, x);
initialize_binary_request(instance, request.message.header);
initialize_binary_request(instance, request.message.header);
@@
-127,8
+128,9
@@
static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
if (success)
{
// Collect the returned items
if (success)
{
// Collect the returned items
- org::libmemcached::Instance* instance;
- while ((instance= memcached_io_get_readable_server(ptr)))
+ memcached_instance_st* instance;
+ memcached_return_t readable_error;
+ while ((instance= memcached_io_get_readable_server(memc, readable_error)))
{
char buffer[32];
memcached_return_t rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
{
char buffer[32];
memcached_return_t rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
@@
-143,7
+145,7
@@
static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
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)
{
@@
-156,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)
{
@@
-176,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)
{
@@
-200,27
+202,28
@@
void memcached_version_instance(org::libmemcached::Instance* instance)
}
}
}
}
-memcached_return_t memcached_version(memcached_st *
ptr
)
+memcached_return_t memcached_version(memcached_st *
shell
)
{
{
- if (ptr)
+ Memcached* memc= memcached2Memcached(shell);
+ if (memc)
{
memcached_return_t rc;
{
memcached_return_t rc;
- if (memcached_failed(rc= initialize_query(
ptr
, true)))
+ if (memcached_failed(rc= initialize_query(
memc
, true)))
{
return rc;
}
{
return rc;
}
- if (memcached_is_udp(
ptr
))
+ if (memcached_is_udp(
memc
))
{
return MEMCACHED_NOT_SUPPORTED;
}
{
return MEMCACHED_NOT_SUPPORTED;
}
- if (memcached_is_binary(
ptr
))
+ if (memcached_is_binary(
memc
))
{
{
- return memcached_version_binary(
ptr
);
+ return memcached_version_binary(
memc
);
}
}
- return memcached_version_textual(
ptr
);
+ return memcached_version_textual(
memc
);
}
return MEMCACHED_INVALID_ARGUMENTS;
}
return MEMCACHED_INVALID_ARGUMENTS;