projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all of the build tree.
[awesomized/libmemcached]
/
libmemcached
/
callback.cc
diff --git
a/libmemcached/callback.cc
b/libmemcached/callback.cc
index 9818af4f860e139c543ce84f311092c6533e83c8..84f99359d78d138e697ca80f8b84f1107fc82c4d 100644
(file)
--- a/
libmemcached/callback.cc
+++ b/
libmemcached/callback.cc
@@
-12,7
+12,9
@@
#include <libmemcached/common.h>
#include <sys/types.h>
#include <libmemcached/common.h>
#include <sys/types.h>
+#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
/*
These functions provide data and function callback support
/*
These functions provide data and function callback support
@@
-20,17
+22,17
@@
memcached_return_t memcached_callback_set(memcached_st *ptr,
const memcached_callback_t flag,
memcached_return_t memcached_callback_set(memcached_st *ptr,
const memcached_callback_t flag,
- void *data)
+
const
void *data)
{
switch (flag)
{
case MEMCACHED_CALLBACK_PREFIX_KEY:
{
{
switch (flag)
{
case MEMCACHED_CALLBACK_PREFIX_KEY:
{
- return memcached_set_
prefix_key
(ptr, (char*)data, data ? strlen((char*)data) : 0);
+ return memcached_set_
namespace
(ptr, (char*)data, data ? strlen((char*)data) : 0);
}
case MEMCACHED_CALLBACK_USER_DATA:
{
}
case MEMCACHED_CALLBACK_USER_DATA:
{
- ptr->user_data=
data
;
+ ptr->user_data=
const_cast<void *>(data)
;
break;
}
case MEMCACHED_CALLBACK_CLEANUP_FUNCTION:
break;
}
case MEMCACHED_CALLBACK_CLEANUP_FUNCTION:
@@
-78,7
+80,6
@@
memcached_return_t memcached_callback_set(memcached_st *ptr,
break;
}
case MEMCACHED_CALLBACK_MAX:
break;
}
case MEMCACHED_CALLBACK_MAX:
- default:
return MEMCACHED_FAILURE;
}
return MEMCACHED_FAILURE;
}
@@
-91,17
+92,19
@@
void *memcached_callback_get(memcached_st *ptr,
{
memcached_return_t local_error;
{
memcached_return_t local_error;
- if (!error)
+ if (error == NULL)
+ {
error = &local_error;
error = &local_error;
+ }
switch (flag)
{
case MEMCACHED_CALLBACK_PREFIX_KEY:
{
switch (flag)
{
case MEMCACHED_CALLBACK_PREFIX_KEY:
{
- if (ptr->
prefix_key
)
+ if (ptr->
_namespace
)
{
*error= MEMCACHED_SUCCESS;
{
*error= MEMCACHED_SUCCESS;
- return (void *)memcached_array_string(ptr->
prefix_key
);
+ return (void *)memcached_array_string(ptr->
_namespace
);
}
else
{
}
else
{
@@
-153,7
+156,7
@@
void *memcached_callback_get(memcached_st *ptr,
}
case MEMCACHED_CALLBACK_MAX:
default:
}
case MEMCACHED_CALLBACK_MAX:
default:
-
WATCHPOINT_ASSERT(0
);
+
assert_msg(0, "Invalid behavior passed to memcached_behavior_set()"
);
*error= MEMCACHED_FAILURE;
return NULL;
}
*error= MEMCACHED_FAILURE;
return NULL;
}