diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-09-30 10:15:03 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-10-05 09:22:54 +0200 |
| commit | b13fdc4860b5e1bf615b113950788a138e68ae7f (patch) | |
| tree | 231723cef2d8432fa559e011d5c7eed93a2482c5 /crypto/bio/b_sock.c | |
| parent | f93ad22f6adb00e722c130e792799467f3927b56 (diff) | |
Explicitly cast INVALID_SOCKET to (int) to address warnings on Windows.
Even though SOCKET is effectively declared as (void *) on Windows, it's
not actually a pointer, but an index within per-process table of
kernel objects. The table size is actually limited and its upper limit
is far below upper limit for signed 32-bit integer. This is what makes
cast in question possible.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/bio/b_sock.c')
| -rw-r--r-- | crypto/bio/b_sock.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 48e40360ad..e536eda2a6 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -391,7 +391,7 @@ int BIO_get_accept_socket(char *host, int bind_mode) struct sockaddr_in6 sa_in6; # endif } server, client; - int s = INVALID_SOCKET, cs, addrlen; + int s = (int)INVALID_SOCKET, cs, addrlen; unsigned char ip[4]; unsigned short port; char *str = NULL, *e; @@ -400,10 +400,10 @@ int BIO_get_accept_socket(char *host, int bind_mode) int err_num; if (BIO_sock_init() != 1) - return (INVALID_SOCKET); + return ((int)INVALID_SOCKET); if ((str = BUF_strdup(host)) == NULL) - return (INVALID_SOCKET); + return ((int)INVALID_SOCKET); h = p = NULL; h = str; @@ -503,7 +503,7 @@ int BIO_get_accept_socket(char *host, int bind_mode) again: s = socket(server.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); - if (s == INVALID_SOCKET) { + if (s == (int)INVALID_SOCKET) { SYSerr(SYS_F_SOCKET, get_last_socket_error()); ERR_add_error_data(3, "port='", host, "'"); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, BIO_R_UNABLE_TO_CREATE_SOCKET); @@ -545,11 +545,11 @@ int BIO_get_accept_socket(char *host, int bind_mode) goto err; } cs = socket(client.sa.sa_family, SOCK_STREAM, SOCKET_PROTOCOL); - if (cs != INVALID_SOCKET) { + if (cs != (int)INVALID_SOCKET) { int ii; ii = connect(cs, &client.sa, addrlen); closesocket(cs); - if (ii == INVALID_SOCKET) { + if (ii == (int)INVALID_SOCKET) { bind_mode = BIO_BIND_REUSEADDR; closesocket(s); goto again; @@ -573,16 +573,16 @@ int BIO_get_accept_socket(char *host, int bind_mode) ret = 1; err: OPENSSL_free(str); - if ((ret == 0) && (s != INVALID_SOCKET)) { + if ((ret == 0) && (s != (int)INVALID_SOCKET)) { closesocket(s); - s = INVALID_SOCKET; + s = (int)INVALID_SOCKET; } return (s); } int BIO_accept(int sock, char **addr) { - int ret = INVALID_SOCKET; + int ret = (int)INVALID_SOCKET; unsigned long l; unsigned short port; char *p; @@ -631,7 +631,7 @@ int BIO_accept(int sock, char **addr) sa.len.i = (int)sa.len.s; /* use sa.len.i from this point */ } - if (ret == INVALID_SOCKET) { + if (ret == (int)INVALID_SOCKET) { if (BIO_sock_should_retry(ret)) return -2; SYSerr(SYS_F_ACCEPT, get_last_socket_error()); |