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
[awesomized/libmemcached]
/
libmemcached
/
memcached.cc
diff --git
a/libmemcached/memcached.cc
b/libmemcached/memcached.cc
index 932b8986fdbfa94a0c017f94650ecfe8d695380d..a3c6a67939490536f56e7c441612886834da566b 100644
(file)
--- a/
libmemcached/memcached.cc
+++ b/
libmemcached/memcached.cc
@@
-136,7
+136,7
@@
static void __memcached_free(Memcached *ptr, bool release_st)
memcached_virtual_bucket_free(ptr);
memcached_virtual_bucket_free(ptr);
- memcached_instance_free((
org::libmemcached::Instance
*)ptr->last_disconnected_server);
+ memcached_instance_free((
memcached_instance_st
*)ptr->last_disconnected_server);
if (ptr->on_cleanup)
{
if (ptr->on_cleanup)
{
@@
-172,38
+172,38
@@
static void __memcached_free(Memcached *ptr, bool release_st)
memcached_st *memcached_create(memcached_st *shell)
{
memcached_st *memcached_create(memcached_st *shell)
{
- Memcached* ptr= memcached2Memcached(shell);
- if (ptr)
+ if (shell)
{
{
-
ptr
->options.is_allocated= false;
+
shell
->options.is_allocated= false;
}
else
{
}
else
{
-
ptr
= (memcached_st *)libmemcached_xmalloc(NULL, memcached_st);
+
shell
= (memcached_st *)libmemcached_xmalloc(NULL, memcached_st);
- if (
ptr
== NULL)
+ if (
shell
== NULL)
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
-
ptr
->options.is_allocated= true;
+
shell
->options.is_allocated= true;
}
}
- if (_memcached_init(
ptr
) == false)
+ if (_memcached_init(
shell
) == false)
{
{
- memcached_free(
ptr
);
+ memcached_free(
shell
);
return NULL;
}
return NULL;
}
- if (memcached_result_create(ptr, &ptr->result) == NULL)
+ Memcached* memc= memcached2Memcached(shell);
+ if (memcached_result_create(shell, &memc->result) == NULL)
{
{
- memcached_free(
ptr
);
+ memcached_free(
shell
);
return NULL;
}
return NULL;
}
- WATCHPOINT_ASSERT_INITIALIZED(&
ptr
->result);
+ WATCHPOINT_ASSERT_INITIALIZED(&
memc
->result);
- return
ptr
;
+ return
shell
;
}
memcached_st *memcached(const char *string, size_t length)
}
memcached_st *memcached(const char *string, size_t length)
@@
-297,7
+297,7
@@
void memcached_reset_last_disconnected_server(memcached_st *shell)
Memcached* self= memcached2Memcached(shell);
if (self)
{
Memcached* self= memcached2Memcached(shell);
if (self)
{
- memcached_instance_free((
org::libmemcached::Instance
*)self->last_disconnected_server);
+ memcached_instance_free((
memcached_instance_st
*)self->last_disconnected_server);
self->last_disconnected_server= NULL;
}
}
self->last_disconnected_server= NULL;
}
}
@@
-432,10
+432,10
@@
void *memcached_set_user_data(memcached_st *shell, void *data)
memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
{
memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
{
- return memcached_instance_push(destination, (
org::libmemcached::Instance
*)source->servers, source->number_of_hosts);
+ return memcached_instance_push(destination, (
memcached_instance_st
*)source->servers, source->number_of_hosts);
}
}
-
org::libmemcached::Instance
* memcached_instance_fetch(Memcached *ptr, uint32_t server_key)
+
memcached_instance_st
* memcached_instance_fetch(Memcached *ptr, uint32_t server_key)
{
if (ptr == NULL)
{
{
if (ptr == NULL)
{
@@
-445,7
+445,7
@@
org::libmemcached::Instance* memcached_instance_fetch(Memcached *ptr, uint32_t s
return &ptr->servers[server_key];
}
return &ptr->servers[server_key];
}
-
memcached_server_instance_st
memcached_server_instance_by_position(const memcached_st *shell, uint32_t server_key)
+
const memcached_instance_st *
memcached_server_instance_by_position(const memcached_st *shell, uint32_t server_key)
{
const Memcached* memc= memcached2Memcached(shell);
if (memc)
{
const Memcached* memc= memcached2Memcached(shell);
if (memc)
@@
-456,7
+456,7
@@
memcached_server_instance_st memcached_server_instance_by_position(const memcach
return NULL;
}
return NULL;
}
-
org::libmemcached::Instance
* memcached_instance_by_position(const memcached_st *shell, uint32_t server_key)
+
memcached_instance_st
* memcached_instance_by_position(const memcached_st *shell, uint32_t server_key)
{
const Memcached* memc= memcached2Memcached(shell);
if (memc)
{
const Memcached* memc= memcached2Memcached(shell);
if (memc)
@@
-478,12
+478,12
@@
uint64_t memcached_query_id(const memcached_st *shell)
return 0;
}
return 0;
}
-
org::libmemcached::Instance
* memcached_instance_list(const memcached_st *shell)
+
memcached_instance_st
* memcached_instance_list(const memcached_st *shell)
{
const Memcached* memc= memcached2Memcached(shell);
if (memc)
{
{
const Memcached* memc= memcached2Memcached(shell);
if (memc)
{
- return (
org::libmemcached::Instance
*)memc->servers;
+ return (
memcached_instance_st
*)memc->servers;
}
return NULL;
}
return NULL;