projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixes for scanner/parser from OSX.
[awesomized/libmemcached]
/
libmemcached
/
instance.cc
diff --git
a/libmemcached/instance.cc
b/libmemcached/instance.cc
index faad235dcfb3f9b66fc9d5fc49b84e30bc49f5e8..593465d8684b324b2026286b18e9a766faabb481 100644
(file)
--- a/
libmemcached/instance.cc
+++ b/
libmemcached/instance.cc
@@
-37,7
+37,7
@@
#include <libmemcached/common.h>
#include <libmemcached/common.h>
-static inline void _server_init(org::libmemcached::Instance* self,
memcached_st
*root,
+static inline void _server_init(org::libmemcached::Instance* self,
Memcached
*root,
const memcached_string_t& hostname,
in_port_t port,
uint32_t weight, memcached_connection_t type)
const memcached_string_t& hostname,
in_port_t port,
uint32_t weight, memcached_connection_t type)
@@
-195,11
+195,12
@@
void memcached_instance_free(org::libmemcached::Instance* self)
}
}
}
}
-memcached_return_t memcached_server_cursor(const memcached_st*
memc
,
+memcached_return_t memcached_server_cursor(const memcached_st*
shell
,
const memcached_server_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
const memcached_server_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
+ const Memcached* memc= memcached2Memcached(shell);
memcached_return_t rc;
if (memcached_failed(rc= initialize_const_query(memc)))
{
memcached_return_t rc;
if (memcached_failed(rc= initialize_const_query(memc)))
{
@@
-255,11
+256,12
@@
memcached_return_t memcached_server_execute(memcached_st *memc,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-memcached_server_instance_st memcached_server_by_key(memcached_st *
memc
,
+memcached_server_instance_st memcached_server_by_key(memcached_st *
shell
,
const char *key,
size_t key_length,
memcached_return_t *error)
{
const char *key,
size_t key_length,
memcached_return_t *error)
{
+ Memcached* memc= memcached2Memcached(shell);
memcached_return_t unused;
if (error == NULL)
{
memcached_return_t unused;
if (error == NULL)
{
@@
-328,15
+330,15
@@
void set_last_disconnected_host(org::libmemcached::Instance* self)
}
}
}
}
-memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *s
elf
)
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *s
hell
)
{
{
-
WATCHPOINT_ASSERT(self
);
- if (self
== NULL
)
+
const Memcached* self= memcached2Memcached(shell
);
+ if (self)
{
{
- return
0
;
+ return
(memcached_server_instance_st)self->last_disconnected_server
;
}
}
- return
(memcached_server_instance_st)self->last_disconnected_server
;
+ return
0
;
}
void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time)
}
void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time)