Rename 'socket' variables to 's' to avoid warning on Windows

Stéphane Raimbault
1 parent ca928d50
Showing 8 changed files with 47 additions and 47 deletions
doc/modbus_set_socket.txt
src/modbus-tcp.c
src/modbus-tcp.h
src/modbus.c
src/modbus.h
tests/bandwidth-server-one.c
tests/random-test-server.c
tests/unit-test-server.c
@@ -9,7 +9,7 @@ modbus_set_socket - set socket of the context
 SYNOPSIS
 --------
-*int modbus_set_socket(modbus_t *'ctx', int 'socket');*
+*int modbus_set_socket(modbus_t *'ctx', int 's');*
 DESCRIPTION
@@ -470,7 +470,7 @@ static int _modbus_tcp_flush(modbus_t *ctx)
 /* Listens for any request from one or many modbus masters in TCP */
 int modbus_tcp_listen(modbus_t *ctx, int nb_connection)
 {
-    int new_socket;
+    int new_s;
     int yes;
     struct sockaddr_in addr;
     modbus_tcp_t *ctx_tcp;
@@ -488,15 +488,15 @@ int modbus_tcp_listen(modbus_t *ctx, int nb_connection)
     }
 #endif
-    new_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if (new_socket == -1) {
+    new_s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (new_s == -1) {
         return -1;
     }
     yes = 1;
-    if (setsockopt(new_socket, SOL_SOCKET, SO_REUSEADDR,
+    if (setsockopt(new_s, SOL_SOCKET, SO_REUSEADDR,
                    (char *) &yes, sizeof(yes)) == -1) {
-        close(new_socket);
+        close(new_s);
         return -1;
     }
@@ -505,17 +505,17 @@ int modbus_tcp_listen(modbus_t *ctx, int nb_connection)
     /* If the modbus port is < to 1024, we need the setuid root. */
     addr.sin_port = htons(ctx_tcp->port);
     addr.sin_addr.s_addr = INADDR_ANY;
-    if (bind(new_socket, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
-        close(new_socket);
+    if (bind(new_s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+        close(new_s);
         return -1;
     }
-    if (listen(new_socket, nb_connection) == -1) {
-        close(new_socket);
+    if (listen(new_s, nb_connection) == -1) {
+        close(new_s);
         return -1;
     }
-    return new_socket;
+    return new_s;
 }
 int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
@@ -526,7 +526,7 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
     struct addrinfo ai_hints;
     const char *node;
     const char *service;
-    int new_socket;
+    int new_s;
     modbus_tcp_pi_t *ctx_tcp_pi;
     if (ctx == NULL) {
@@ -567,7 +567,7 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
         return -1;
     }
-    new_socket = -1;
+    new_s = -1;
     for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) {
         int s;
@@ -609,22 +609,22 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
             continue;
         }
-        new_socket = s;
+        new_s = s;
         break;
     }
     freeaddrinfo(ai_list);
-    if (new_socket < 0) {
+    if (new_s < 0) {
         return -1;
     }
-    return new_socket;
+    return new_s;
 }
 /* On success, the function return a non-negative integer that is a descriptor
 for the accepted socket. On error, socket is set to -1, -1 is returned and errno
 is set appropriately. */
-int modbus_tcp_accept(modbus_t *ctx, int *socket)
+int modbus_tcp_accept(modbus_t *ctx, int *s)
 {
     struct sockaddr_in addr;
     socklen_t addrlen;
@@ -637,14 +637,14 @@ int modbus_tcp_accept(modbus_t *ctx, int *socket)
     addrlen = sizeof(addr);
 #ifdef HAVE_ACCEPT4
     /* Inherit socket flags and use accept4 call */
-    ctx->s = accept4(*socket, (struct sockaddr *)&addr, &addrlen, SOCK_CLOEXEC);
+    ctx->s = accept4(*s, (struct sockaddr *)&addr, &addrlen, SOCK_CLOEXEC);
 #else
-    ctx->s = accept(*socket, (struct sockaddr *)&addr, &addrlen);
+    ctx->s = accept(*s, (struct sockaddr *)&addr, &addrlen);
 #endif
     if (ctx->s == -1) {
-        close(*socket);
-        *socket = -1;
+        close(*s);
+        *s = -1;
         return -1;
     }
@@ -656,7 +656,7 @@ int modbus_tcp_accept(modbus_t *ctx, int *socket)
     return ctx->s;
 }
-int modbus_tcp_pi_accept(modbus_t *ctx, int *socket)
+int modbus_tcp_pi_accept(modbus_t *ctx, int *s)
 {
     struct sockaddr_storage addr;
     socklen_t addrlen;
@@ -667,10 +667,10 @@ int modbus_tcp_pi_accept(modbus_t *ctx, int *socket)
     }
     addrlen = sizeof(addr);
-    ctx->s = accept(*socket, (void *)&addr, &addrlen);
+    ctx->s = accept(*s, (void *)&addr, &addrlen);
     if (ctx->s == -1) {
-        close(*socket);
-        *socket = -1;
+        close(*s);
+        *s = -1;
     }
     if (ctx->debug) {
@@ -53,11 +53,11 @@ MODBUS_BEGIN_DECLS
 EXPORT modbus_t* modbus_new_tcp(const char *ip_address, int port);
 EXPORT int modbus_tcp_listen(modbus_t *ctx, int nb_connection);
-EXPORT int modbus_tcp_accept(modbus_t *ctx, int *socket);
+EXPORT int modbus_tcp_accept(modbus_t *ctx, int *s);
 EXPORT modbus_t* modbus_new_tcp_pi(const char *node, const char *service);
 EXPORT int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection);
-EXPORT int modbus_tcp_pi_accept(modbus_t *ctx, int *socket);
+EXPORT int modbus_tcp_pi_accept(modbus_t *ctx, int *s);
 MODBUS_END_DECLS
@@ -1565,14 +1565,14 @@ int modbus_set_error_recovery(modbus_t *ctx,
     return 0;
 }
-int modbus_set_socket(modbus_t *ctx, int socket)
+int modbus_set_socket(modbus_t *ctx, int s)
 {
     if (ctx == NULL) {
         errno = EINVAL;
         return -1;
     }
-    ctx->s = socket;
+    ctx->s = s;
     return 0;
 }
@@ -156,7 +156,7 @@ typedef enum
 EXPORT int modbus_set_slave(modbus_t* ctx, int slave);
 EXPORT int modbus_set_error_recovery(modbus_t *ctx, modbus_error_recovery_mode error_recovery);
-EXPORT int modbus_set_socket(modbus_t *ctx, int socket);
+EXPORT int modbus_set_socket(modbus_t *ctx, int s);
 EXPORT int modbus_get_socket(modbus_t *ctx);
 EXPORT int modbus_get_response_timeout(modbus_t *ctx, struct timeval *timeout);
@@ -36,7 +36,7 @@ enum {
 int main(int argc, char *argv[])
 {
-    int socket = -1;
+    int s = -1;
     modbus_t *ctx = NULL;
     modbus_mapping_t *mb_mapping = NULL;
     int rc;
@@ -59,8 +59,8 @@ int main(int argc, char *argv[])
     if (use_backend == TCP) {
         ctx = modbus_new_tcp("127.0.0.1", 1502);
-        socket = modbus_tcp_listen(ctx, 1);
-        modbus_tcp_accept(ctx, &socket);
+        s = modbus_tcp_listen(ctx, 1);
+        modbus_tcp_accept(ctx, &s);
     } else {
         ctx = modbus_new_rtu("/dev/ttyUSB0", 115200, 'N', 8, 1);
@@ -92,8 +92,8 @@ int main(int argc, char *argv[])
     printf("Quit the loop: %s\n", modbus_strerror(errno));
     modbus_mapping_free(mb_mapping);
-    if (socket != -1) {
-        close(socket);
+    if (s != -1) {
+        close(s);
     }
     /* For RTU, skipped by TCP (no TCP connect) */
     modbus_close(ctx);
@@ -26,7 +26,7 @@
 int main(void)
 {
-    int socket = -1;
+    int s = -1;
     modbus_t *ctx;
     modbus_mapping_t *mb_mapping;
@@ -41,8 +41,8 @@ int main(void)
         return -1;
     }
-    socket = modbus_tcp_listen(ctx, 1);
-    modbus_tcp_accept(ctx, &socket);
+    s = modbus_tcp_listen(ctx, 1);
+    modbus_tcp_accept(ctx, &s);
     for (;;) {
         uint8_t query[MODBUS_TCP_MAX_ADU_LENGTH];
@@ -60,8 +60,8 @@ int main(void)
     printf("Quit the loop: %s\n", modbus_strerror(errno));
-    if (socket != -1) {
-        close(socket);
+    if (s != -1) {
+        close(s);
     }
     modbus_mapping_free(mb_mapping);
     modbus_close(ctx);
@@ -32,7 +32,7 @@ enum {
 int main(int argc, char*argv[])
 {
-    int socket = -1;
+    int s = -1;
     modbus_t *ctx;
     modbus_mapping_t *mb_mapping;
     int rc;
@@ -124,11 +124,11 @@ int main(int argc, char*argv[])
     }
     if (use_backend == TCP) {
-        socket = modbus_tcp_listen(ctx, 1);
-        modbus_tcp_accept(ctx, &socket);
+        s = modbus_tcp_listen(ctx, 1);
+        modbus_tcp_accept(ctx, &s);
     } else if (use_backend == TCP_PI) {
-        socket = modbus_tcp_pi_listen(ctx, 1);
-        modbus_tcp_pi_accept(ctx, &socket);
+        s = modbus_tcp_pi_listen(ctx, 1);
+        modbus_tcp_pi_accept(ctx, &s);
     } else {
         rc = modbus_connect(ctx);
         if (rc == -1) {
@@ -187,8 +187,8 @@ int main(int argc, char*argv[])
     printf("Quit the loop: %s\n", modbus_strerror(errno));
     if (use_backend == TCP) {
-        if (socket != -1) {
-            close(socket);
+        if (s != -1) {
+            close(s);
         }
     }
     modbus_mapping_free(mb_mapping);