diff options
author | Rich Salz <rsalz@akamai.com> | 2019-07-16 12:54:24 -0400 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-07-22 16:24:56 +0200 |
commit | 46160e6fb957a3f4141c13cba75d03c05b240968 (patch) | |
tree | 5dd5b2dcbad972efab0aa20146e53f7032574298 /crypto/bio/b_sock.c | |
parent | 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 (diff) |
Deprecate SYSerr, add new FUNCerr macro
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9072)
Diffstat (limited to 'crypto/bio/b_sock.c')
-rw-r--r-- | crypto/bio/b_sock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index f6ad9f03a9..46a2ff7dbc 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -129,7 +129,7 @@ int BIO_sock_init(void) * probed at run-time with DSO_global_lookup. */ if (WSAStartup(0x0202, &wsa_state) != 0) { - SYSerr("wsastartup", get_last_socket_error()); + FUNCerr("wsastartup", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCK_INIT, BIO_R_WSASTARTUP); return -1; } @@ -189,7 +189,7 @@ int BIO_socket_ioctl(int fd, long type, void *arg) i = ioctlsocket(fd, type, ARG); # endif /* __DJGPP__ */ if (i < 0) - SYSerr("ioctlsocket", get_last_socket_error()); + FUNCerr("ioctlsocket", get_last_socket_error()); return i; } @@ -240,7 +240,7 @@ int BIO_accept(int sock, char **ip_port) ret = -2; goto end; } - SYSerr("accept", get_last_socket_error()); + FUNCerr("accept", get_last_socket_error()); BIOerr(BIO_F_BIO_ACCEPT, BIO_R_ACCEPT_ERROR); goto end; } @@ -305,7 +305,7 @@ int BIO_socket_nbio(int s, int mode) l = fcntl(s, F_GETFL, 0); if (l == -1) { - SYSerr("fcntl", get_last_sys_error()); + FUNCerr("fcntl", get_last_sys_error()); ret = -1; } else { # if defined(O_NONBLOCK) @@ -323,7 +323,7 @@ int BIO_socket_nbio(int s, int mode) ret = fcntl(s, F_SETFL, l); if (ret < 0) { - SYSerr("fcntl", get_last_sys_error()); + FUNCerr("fcntl", get_last_sys_error()); } } # else @@ -346,7 +346,7 @@ int BIO_sock_info(int sock, ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr), &addr_len); if (ret == -1) { - SYSerr("getsockname", get_last_socket_error()); + FUNCerr("getsockname", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCK_INFO, BIO_R_GETSOCKNAME_ERROR); return 0; } |