projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update docs.
[m6w6/libmemcached]
/
libmemcached
/
connect.c
diff --git
a/libmemcached/connect.c
b/libmemcached/connect.c
index 7b38def933762ad29d29c52cf7f5a2952b520bbd..c4b263e1fe2fadcd8f917aa223b81e17146cf418 100644
(file)
--- a/
libmemcached/connect.c
+++ b/
libmemcached/connect.c
@@
-80,7
+80,6
@@
static memcached_return_t connect_poll(memcached_server_st *ptr)
return MEMCACHED_ERRNO;
}
}
return MEMCACHED_ERRNO;
}
}
- WATCHPOINT_ASSERT(0); // Programming error
}
// This should only be possible from ERESTART or EINTR;
}
// This should only be possible from ERESTART or EINTR;
@@
-537,7
+536,7
@@
memcached_return_t memcached_connect(memcached_server_write_instance_st ptr)
case MEMCACHED_CONNECTION_TCP:
rc= network_connect(ptr);
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
case MEMCACHED_CONNECTION_TCP:
rc= network_connect(ptr);
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
- if (ptr->fd != INVALID_SOCKET && ptr->root->sasl
&& ptr->root->sasl->
callbacks)
+ if (ptr->fd != INVALID_SOCKET && ptr->root->sasl
.
callbacks)
{
rc= memcached_sasl_authenticate_connection(ptr);
if (rc != MEMCACHED_SUCCESS)
{
rc= memcached_sasl_authenticate_connection(ptr);
if (rc != MEMCACHED_SUCCESS)