projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Clean up semantics for calling memcached_create() internally.
[awesomized/libmemcached]
/
libmemcached
/
memcached.cc
diff --git
a/libmemcached/memcached.cc
b/libmemcached/memcached.cc
index 932b8986fdbfa94a0c017f94650ecfe8d695380d..a5d1a52738221edfd1464594ba60dc524999a1a1 100644
(file)
--- a/
libmemcached/memcached.cc
+++ b/
libmemcached/memcached.cc
@@
-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)