generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unused parameters from internal functions

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz
2016-02-13 22:33:56 -05:00
committed by Rich Salz
parent 5de75fb4fb
commit a773b52a61
45 changed files with 216 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
apps/s_socket.c
View File

@@ -221,10 +221,8 @@ int init_client(int *sock, const char *host, const char *port,
* 0 on failure, something other on success.
*/
int do_server(int *accept_sock, const char *host, const char *port,
int family, int type,
int (*cb) (const char *hostname, int s, int stype,
unsigned char *context), unsigned char *context,
int naccept)
int family, int type, do_server_cb cb,
unsigned char *context, int naccept)
{
int asock = 0;
int sock;
@@ -258,50 +256,26 @@ int do_server(int *accept_sock, const char *host, const char *port,
}
BIO_ADDRINFO_free(res);
res = NULL;
if (accept_sock != NULL) {
if (accept_sock != NULL)
*accept_sock = asock;
}
for (;;) {
BIO_ADDR *accepted_addr = NULL;
char *name = NULL;
if (type == SOCK_STREAM) {
if ((accepted_addr = BIO_ADDR_new()) == NULL) {
BIO_closesocket(asock);
return 0;
}
redoit:
sock = BIO_accept_ex(asock, accepted_addr, 0);
do {
sock = BIO_accept_ex(asock, NULL, 0);
} while (sock < 0 && BIO_sock_should_retry(ret));
if (sock < 0) {
if (BIO_sock_should_retry(ret)) {
goto redoit;
} else {
ERR_print_errors(bio_err);
BIO_ADDR_free(accepted_addr);
SHUTDOWN(asock);
break;
}
ERR_print_errors(bio_err);
SHUTDOWN(asock);
break;
}
i = (*cb)(sock, type, context);
SHUTDOWN2(sock);
} else {
sock = asock;
i = (*cb)(asock, type, context);
}
/* accepted_addr is NULL if we're dealing with SOCK_DGRAM
* this means that for SOCK_DGRAM, name will be NULL
*/
if (accepted_addr != NULL) {
#ifdef AF_UNIX
if (family == AF_UNIX)
name = BIO_ADDR_path_string(accepted_addr);
else
#endif
name = BIO_ADDR_hostname_string(accepted_addr, 0);
}
i = (*cb) (name, sock, type, context);
OPENSSL_free(name);
BIO_ADDR_free(accepted_addr);
if (type == SOCK_STREAM)
SHUTDOWN2(sock);
if (naccept != -1)
naccept--;
if (i < 0 || naccept == 0) {