projects
/
m6w6
/
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-164
[m6w6/libmemcached]
/
libmemcached
/
behavior.cc
diff --git
a/libmemcached/behavior.cc
b/libmemcached/behavior.cc
index c381a513cfbceab5322de4507da5b29698e0403b..33926c83236a50f7a97d8cf2341bb806de99a4a7 100644
(file)
--- a/
libmemcached/behavior.cc
+++ b/
libmemcached/behavior.cc
@@
-427,7
+427,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return 0;
}
return 0;
}
- if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, &sock_size, &sock_length) < 0)
+ if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF,
(char*)
&sock_size, &sock_length) < 0)
{
memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
return 0; /* Zero means error */
{
memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
return 0; /* Zero means error */
@@
-463,7
+463,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
return 0;
}
return 0;
}
- if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, &sock_size, &sock_length) < 0)
+ if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF,
(char*)
&sock_size, &sock_length) < 0)
{
memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
return 0; /* Zero means error */
{
memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
return 0; /* Zero means error */
@@
-505,7
+505,7
@@
uint64_t memcached_behavior_get(memcached_st *ptr,
case MEMCACHED_BEHAVIOR_MAX:
default:
case MEMCACHED_BEHAVIOR_MAX:
default:
- assert_msg(0, "Invalid behavior passed to memcached_behavior_
s
et()");
+ assert_msg(0, "Invalid behavior passed to memcached_behavior_
g
et()");
return 0;
}
return 0;
}