projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-188
[awesomized/libmemcached]
/
libmemcached
/
callback.cc
diff --git
a/libmemcached/callback.cc
b/libmemcached/callback.cc
index 83d8ce8fc8ca33a1a16a684dd4b0796ef4417e65..3d87f98d7f811f0e0e044449eaeb2f97b701d77a 100644
(file)
--- a/
libmemcached/callback.cc
+++ b/
libmemcached/callback.cc
@@
-90,7
+90,6
@@
void *memcached_callback_get(memcached_st *ptr,
memcached_return_t *error)
{
memcached_return_t local_error;
memcached_return_t *error)
{
memcached_return_t local_error;
-
if (error == NULL)
{
error = &local_error;
if (error == NULL)
{
error = &local_error;
@@
-148,7
+147,7
@@
void *memcached_callback_get(memcached_st *ptr,
break;
}
break;
}
- assert_msg(0, "Invalid
behavior passed to memcached_behavior_s
et()");
+ assert_msg(0, "Invalid
callback passed to memcached_callback_g
et()");
*error= MEMCACHED_FAILURE;
return NULL;
}
*error= MEMCACHED_FAILURE;
return NULL;
}