projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update hardening flags.
[awesomized/libmemcached]
/
libmemcached
/
do.cc
diff --git
a/libmemcached/do.cc
b/libmemcached/do.cc
index 61a143b888d798ace2a3361a63db912ab183b9a7..db533680f77193f80ea3dd6ce37eb65bcb1f3639 100644
(file)
--- a/
libmemcached/do.cc
+++ b/
libmemcached/do.cc
@@
-11,7
+11,7
@@
#include <libmemcached/common.h>
#include <libmemcached/common.h>
-memcached_return_t memcached_vdo(
memcached_server_write_instance_st
instance,
+memcached_return_t memcached_vdo(
org::libmemcached::Instance*
instance,
libmemcached_io_vector_st vector[],
const size_t count,
const bool with_flush)
libmemcached_io_vector_st vector[],
const size_t count,
const bool with_flush)
@@
-23,7
+23,7
@@
memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
if (memcached_failed(rc= memcached_connect(instance)))
{
WATCHPOINT_ERROR(rc);
if (memcached_failed(rc= memcached_connect(instance)))
{
WATCHPOINT_ERROR(rc);
- assert_msg(instance->error_messages, "memcached_connect() returned an error but the
memcached_server_write_instance_st
showed none.");
+ assert_msg(instance->error_messages, "memcached_connect() returned an error but the
Instance
showed none.");
return rc;
}
return rc;
}
@@
-48,7
+48,11
@@
memcached_return_t memcached_vdo(memcached_server_write_instance_st instance,
vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
msg.msg_iov= (struct iovec*)vector;
vector[0].length= UDP_DATAGRAM_HEADER_LENGTH;
msg.msg_iov= (struct iovec*)vector;
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
+ msg.msg_iovlen= int(count);
+#else
msg.msg_iovlen= count;
msg.msg_iovlen= count;
+#endif
uint32_t retry= 5;
while (--retry)
uint32_t retry= 5;
while (--retry)