diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-08-31 11:15:25 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-09-08 20:26:19 -0700 |
| commit | 5465b8c85efda20a79d23db28fde7ee403aec8f3 (patch) | |
| tree | 5016155a7e40645ca1d920c72ef98eb244b98709 /tests | |
| parent | 49ae93130a38d78cca3dac0bfdd243ff5993989c (diff) | |
| download | xrdp-proprietary-5465b8c85efda20a79d23db28fde7ee403aec8f3.tar.gz xrdp-proprietary-5465b8c85efda20a79d23db28fde7ee403aec8f3.zip | |
Add socklen_t check with substitution, use socklen_t as needed
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gtcp_proxy/gtcp.c | 30 | ||||
| -rw-r--r-- | tests/tcp_proxy/main.c | 6 |
2 files changed, 6 insertions, 30 deletions
diff --git a/tests/gtcp_proxy/gtcp.c b/tests/gtcp_proxy/gtcp.c index 504138bf..a27f2ea6 100644 --- a/tests/gtcp_proxy/gtcp.c +++ b/tests/gtcp_proxy/gtcp.c @@ -26,12 +26,7 @@ int tcp_socket_create(void) { int rv; int option_value; - -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; /* in win32 a socket is an unsigned int, in linux, it's an int */ if ((rv = (int) socket(PF_INET, SOCK_STREAM, 0)) < 0) @@ -133,12 +128,7 @@ int tcp_accept(int skt) int ret ; char ipAddr[256] ; struct sockaddr_in s; - -#if defined(_WIN32) - int i; -#else - unsigned int i; -#endif + socklen_t i; i = sizeof(struct sockaddr_in); memset(&s, 0, i); @@ -186,12 +176,7 @@ int tcp_socket(void) { int rv; int option_value; - -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; /* in win32 a socket is an unsigned int, in linux, it's an int */ if ((rv = (int) socket(PF_INET, SOCK_STREAM, 0)) < 0) @@ -305,14 +290,7 @@ int tcp_can_send(int skt, int millis) int tcp_socket_ok(int skt) { int opt; - -#if defined(_WIN32) - int opt_len; -#else - unsigned int opt_len; -#endif - - opt_len = sizeof(opt); + socklen_t opt_len = sizeof(opt); if (getsockopt(skt, SOL_SOCKET, SO_ERROR, (char *) (&opt), &opt_len) == 0) { diff --git a/tests/tcp_proxy/main.c b/tests/tcp_proxy/main.c index 3a62c98c..5ea53f5f 100644 --- a/tests/tcp_proxy/main.c +++ b/tests/tcp_proxy/main.c @@ -121,7 +121,7 @@ g_tcp_socket(void) { int rv; int option_value; - unsigned int option_len; + socklen_t option_len; rv = (int)socket(AF_INET, SOCK_STREAM, 0); if (rv < 0) @@ -336,9 +336,7 @@ static int APP_CC g_tcp_socket_ok(int sck) { int opt; - unsigned int opt_len; - - opt_len = sizeof(opt); + socklen_t opt_len = sizeof(opt); if (getsockopt(sck, SOL_SOCKET, SO_ERROR, (char *)(&opt), &opt_len) == 0) { |