Socket should be memcached_socket_t

diff --git a/clients/memcapable.c b/clients/memcapable.c
index 051c6457cca165d8e2e2b2c15cced21cf919731e..2527861739c00c3e7f618558944968c99433aa1f 100644 (file)
--- a/clients/memcapable.c
+++ b/clients/memcapable.c
@@ -44,7 +44,7 @@
 /* Should we generate coredumps when we enounter an error (-c) */
 static bool do_core= false;
 /* connection to the server */
-static SOCKET sock;
+static memcached_socket_t sock;
 /* Should the output from test failures be verbose or quiet? */
 static bool verbose= false;
 
@@ -108,7 +108,7 @@ static struct addrinfo *lookuphost(const char *hostname, const char *port)
  * Set the socket in nonblocking mode
  * @return -1 if failure, the socket otherwise
  */
-static SOCKET set_noblock(void)
+static memcached_socket_t set_noblock(void)
 {
 #ifdef WIN32
   u_long arg = 1;
@@ -146,7 +146,7 @@ static SOCKET set_noblock(void)
  * @param port the port number (or service) to connect to
  * @return positive integer if success, -1 otherwise
  */
-static SOCKET connect_server(const char *hostname, const char *port)
+static memcached_socket_t connect_server(const char *hostname, const char *port)
 {
   struct addrinfo *ai= lookuphost(hostname, port);
   sock= INVALID_SOCKET;
@@ -177,7 +177,7 @@ static SOCKET connect_server(const char *hostname, const char *port)
   return sock;
 }
 
-static ssize_t timeout_io_op(SOCKET fd, short direction, void *buf, size_t len)
+static ssize_t timeout_io_op(memcached_socket_t fd, short direction, void *buf, size_t len)
 {
   ssize_t ret;
 

diff --git a/example/memcached_light.c b/example/memcached_light.c
index 96c74d7e6f6904cae5802b61ff74a87141a9f07f..0b434a5f6cbf864420d91ced4b9f7df73d0976cd 100644 (file)
--- a/example/memcached_light.c
+++ b/example/memcached_light.c
@@ -42,7 +42,7 @@
 extern memcached_binary_protocol_callback_st interface_v0_impl;
 extern memcached_binary_protocol_callback_st interface_v1_impl;
 
-static SOCKET server_sockets[1024];
+static memcached_socket_t server_sockets[1024];
 static int num_server_sockets= 0;
 
 struct connection
@@ -72,7 +72,7 @@ typedef struct options_st options_st;
  * @param which identifying the event that occurred (not used)
  * @param arg the connection structure for the client
  */
-static void drive_client(SOCKET fd, short which, void *arg)
+static void drive_client(memcached_socket_t fd, short which, void *arg)
 {
   (void)which;
   struct connection *client= arg;
@@ -114,14 +114,14 @@ static void drive_client(SOCKET fd, short which, void *arg)
  * @param which identifying the event that occurred (not used)
  * @param arg the connection structure for the server
  */
-static void accept_handler(SOCKET fd, short which, void *arg)
+static void accept_handler(memcached_socket_t fd, short which, void *arg)
 {
   (void)which;
   struct connection *server= arg;
   /* accept new client */
   struct sockaddr_storage addr;
   socklen_t addrlen= sizeof(addr);
-  SOCKET sock= accept(fd, (struct sockaddr *)&addr, &addrlen);
+  memcached_socket_t sock= accept(fd, (struct sockaddr *)&addr, &addrlen);
 
   if (sock == INVALID_SOCKET)
   {
@@ -187,7 +187,7 @@ static int server_socket(const char *port)
 
   for (struct addrinfo *next= ai; next; next= next->ai_next)
   {
-    SOCKET sock= socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    memcached_socket_t sock= socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
     if (sock == INVALID_SOCKET)
     {
       perror("Failed to create socket");

diff --git a/libmemcached/platform.h b/libmemcached/platform.h
index 8b30f7732a99b4783e781d28dab4f3409a5b4ac2..9eafbb144d0dcd6d562028d00f24e010fa5c8e62 100644 (file)
--- a/libmemcached/platform.h
+++ b/libmemcached/platform.h
@@ -16,8 +16,9 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 typedef short in_port_t;
+typedef SOCKET memcached_socket_t;
 #else
-typedef int SOCKET;
+typedef int memcached_socket_t;
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netdb.h>

diff --git a/libmemcached/protocol/common.h b/libmemcached/protocol/common.h
index 0a64df66e9c3ad014c8bb5df94de64cf0cde9bf6..f7fa60448f5ac9e13aa3b1496e47ad8955678b1f 100644 (file)
--- a/libmemcached/protocol/common.h
+++ b/libmemcached/protocol/common.h
@@ -98,7 +98,7 @@ enum ascii_cmd {
 
 struct memcached_protocol_client_st {
   memcached_protocol_st *root;
-  SOCKET sock;
+  memcached_socket_t sock;
   int error;
 
   /* Linked list of data to send */

diff --git a/libmemcached/protocol/protocol_handler.c b/libmemcached/protocol/protocol_handler.c
index 77d6814d447a42253dd4c93d8cc8352342303ed3..fcab1419f7c100083a232b0c405cb0ccf65da806 100644 (file)
--- a/libmemcached/protocol/protocol_handler.c
+++ b/libmemcached/protocol/protocol_handler.c
@@ -28,7 +28,7 @@
  * @return the number of bytes transferred of -1 upon error
  */
 static ssize_t default_recv(const void *cookie,
-                            SOCKET sock,
+                            memcached_socket_t sock,
                             void *buf,
                             size_t nbytes)
 {
@@ -48,7 +48,7 @@ static ssize_t default_recv(const void *cookie,
  * @return the number of bytes transferred of -1 upon error
  */
 static ssize_t default_send(const void *cookie,
-                            SOCKET fd,
+                            memcached_socket_t fd,
                             const void *buf,
                             size_t nbytes)
 {
@@ -269,7 +269,7 @@ void memcached_protocol_destroy_instance(struct memcached_protocol_st *instance)
   free(instance);
 }
 
-struct memcached_protocol_client_st *memcached_protocol_create_client(struct memcached_protocol_st *instance, SOCKET sock)
+struct memcached_protocol_client_st *memcached_protocol_create_client(struct memcached_protocol_st *instance, memcached_socket_t sock)
 {
   struct memcached_protocol_client_st *ret= calloc(1, sizeof(*ret));
   if (ret != NULL)

diff --git a/libmemcached/protocol_handler.h b/libmemcached/protocol_handler.h
index 0e65ea9cfd70d3fe9f559d361056d0ba56aa63b9..9f61187f562174041989d67811e67791a26b9476 100644 (file)
--- a/libmemcached/protocol_handler.h
+++ b/libmemcached/protocol_handler.h
@@ -49,7 +49,7 @@ extern "C" {
  *         or -1 upon error (errno should contain more information)
  */
 typedef ssize_t (*memcached_protocol_recv_func)(const void *cookie,
-                                                SOCKET fd,
+                                                memcached_socket_t fd,
                                                 void *buf,
                                                 size_t nbuf);
 
@@ -65,7 +65,7 @@ typedef ssize_t (*memcached_protocol_recv_func)(const void *cookie,
  *         or -1 upon error (errno should contain more information)
  */
 typedef ssize_t (*memcached_protocol_send_func)(const void *cookie,
-                                                SOCKET fd,
+                                                memcached_socket_t fd,
                                                 const void *buf,
                                                 size_t nbuf);
 
@@ -140,7 +140,7 @@ void memached_protocol_set_io_functions(memcached_protocol_st *instance,
  * @return NULL if allocation fails, otherwise an instance
  */
 LIBMEMCACHED_API
-memcached_protocol_client_st *memcached_protocol_create_client(memcached_protocol_st *instance, SOCKET sock);
+memcached_protocol_client_st *memcached_protocol_create_client(memcached_protocol_st *instance, memcached_socket_t sock);
 
 /**
  * Destroy a client handle.
@@ -192,7 +192,7 @@ memcached_protocol_event_t memcached_protocol_client_work(memcached_protocol_cli
  * @return the socket handle
  */
 LIBMEMCACHED_API
-SOCKET memcached_protocol_client_get_socket(memcached_protocol_client_st *client);
+memcached_socket_t memcached_protocol_client_get_socket(memcached_protocol_client_st *client);
 
 /**
  * Get the error id socket attached to a client handle

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 4de191efcaf6a659dc96834340e8b49f90993bbc..2206c7b852475898ff5505f2d6426bbd68d6a77e 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -24,7 +24,7 @@ struct memcached_server_st {
   uint32_t cursor_active;
   in_port_t port;
   int cached_errno;
-  SOCKET fd;
+  memcached_socket_t fd;
   uint32_t io_bytes_sent; /* # bytes sent since last read */
   uint32_t server_failure_counter;
   uint32_t weight;