projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove how use instance (keep API intact)
[m6w6/libmemcached]
/
libmemcached
/
connect.cc
diff --git
a/libmemcached/connect.cc
b/libmemcached/connect.cc
index 8e8092c860cc29c95f8499a050cd365d95e72bc3..a8a2c5a4631126cef98200eacfe263a7ab680579 100644
(file)
--- a/
libmemcached/connect.cc
+++ b/
libmemcached/connect.cc
@@
-46,7
+46,7
@@
#define SOCK_CLOEXEC 0
#endif
#define SOCK_CLOEXEC 0
#endif
-static memcached_return_t connect_poll(memcached_
server
_st *server)
+static memcached_return_t connect_poll(memcached_
instance
_st *server)
{
struct pollfd fds[1];
fds[0].fd= server->fd;
{
struct pollfd fds[1];
fds[0].fd= server->fd;
@@
-139,7
+139,7
@@
static memcached_return_t connect_poll(memcached_server_st *server)
return memcached_set_errno(*server, get_socket_errno(), MEMCACHED_AT);
}
return memcached_set_errno(*server, get_socket_errno(), MEMCACHED_AT);
}
-static memcached_return_t set_hostinfo(memcached_
server
_st *server)
+static memcached_return_t set_hostinfo(memcached_
instance
_st *server)
{
assert(server->type != MEMCACHED_CONNECTION_UNIX_SOCKET);
if (server->address_info)
{
assert(server->type != MEMCACHED_CONNECTION_UNIX_SOCKET);
if (server->address_info)
@@
-203,7
+203,7
@@
static memcached_return_t set_hostinfo(memcached_server_st *server)
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-static inline void set_socket_nonblocking(memcached_
server
_st *server)
+static inline void set_socket_nonblocking(memcached_
instance
_st *server)
{
#ifdef WIN32
u_long arg= 1;
{
#ifdef WIN32
u_long arg= 1;
@@
-240,7
+240,7
@@
static inline void set_socket_nonblocking(memcached_server_st *server)
#endif
}
#endif
}
-static void set_socket_options(memcached_
server
_st *server)
+static void set_socket_options(memcached_
instance
_st *server)
{
assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()");
{
assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()");
@@
-349,7
+349,7
@@
static void set_socket_options(memcached_server_st *server)
set_socket_nonblocking(server);
}
set_socket_nonblocking(server);
}
-static memcached_return_t unix_socket_connect(memcached_
server
_st *server)
+static memcached_return_t unix_socket_connect(memcached_
instance
_st *server)
{
#ifndef WIN32
WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
{
#ifndef WIN32
WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
@@
-400,7
+400,7
@@
static memcached_return_t unix_socket_connect(memcached_server_st *server)
#endif
}
#endif
}
-static memcached_return_t network_connect(memcached_
server
_st *server)
+static memcached_return_t network_connect(memcached_
instance
_st *server)
{
bool timeout_error_occured= false;
{
bool timeout_error_occured= false;
@@
-554,7
+554,7
@@
static memcached_return_t network_connect(memcached_server_st *server)
if (memcached_has_current_error(*server))
{
if (memcached_has_current_error(*server))
{
- return memcached_
server
_error_return(server);
+ return memcached_
instance
_error_return(server);
}
if (timeout_error_occured and server->state < MEMCACHED_SERVER_STATE_IN_PROGRESS)
}
if (timeout_error_occured and server->state < MEMCACHED_SERVER_STATE_IN_PROGRESS)
@@
-704,7
+704,7
@@
static memcached_return_t _memcached_connect(memcached_server_write_instance_st
if (memcached_has_current_error(*server))
{
memcached_mark_server_for_timeout(server);
if (memcached_has_current_error(*server))
{
memcached_mark_server_for_timeout(server);
- assert(memcached_failed(memcached_
server
_error_return(server)));
+ assert(memcached_failed(memcached_
instance
_error_return(server)));
}
else
{
}
else
{