projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating the exceptions header file with some slight modifications.
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index e9ae0c76d92c9c0bef3a4e53ab1c7ee10731da15..93738f4aa3d9173b3fc59d9e53b958b0b4ea31c6 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-152,7
+152,7
@@
static memcached_return unix_socket_connect(memcached_server_st *ptr)
servAddr.sun_family= AF_UNIX;
strcpy(servAddr.sun_path, ptr->hostname); /* Copy filename */
servAddr.sun_family= AF_UNIX;
strcpy(servAddr.sun_path, ptr->hostname); /* Copy filename */
- addrlen=
strlen(servAddr.sun_path) + sizeof(servAddr.sun_family
);
+ addrlen=
(socklen_t) (strlen(servAddr.sun_path) + sizeof(servAddr.sun_family)
);
test_connect:
if (connect(ptr->fd,
test_connect:
if (connect(ptr->fd,
@@
-218,7
+218,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
(void)set_socket_options(ptr);
(void)set_socket_options(ptr);
- int flags;
+ int flags
= 0
;
if (ptr->root->connect_timeout)
{
flags= fcntl(ptr->fd, F_GETFL, 0);
if (ptr->root->connect_timeout)
{
flags= fcntl(ptr->fd, F_GETFL, 0);
@@
-306,6
+306,7
@@
memcached_return memcached_connect(memcached_server_st *ptr)
LIBMEMCACHED_MEMCACHED_CONNECT_START();
/* both retry_timeout and server_failure_limit must be set in order to delay retrying a server on error. */
LIBMEMCACHED_MEMCACHED_CONNECT_START();
/* both retry_timeout and server_failure_limit must be set in order to delay retrying a server on error. */
+ WATCHPOINT_ASSERT(ptr->root);
if (ptr->root->retry_timeout && ptr->root->server_failure_limit)
{
struct timeval next_time;
if (ptr->root->retry_timeout && ptr->root->server_failure_limit)
{
struct timeval next_time;