summaryrefslogtreecommitdiffstats
path: root/lib/libtls/tls_client.c
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2015-01-02 16:38:07 +0000
committerbluhm <bluhm@openbsd.org>2015-01-02 16:38:07 +0000
commit53687b848ae2d8fe2ec14899c4c6c64c58a34349 (patch)
tree2a6172c3b3269c1809dae0321d0c882429c0f07a /lib/libtls/tls_client.c
parentStill locks up under load, but otherwise fairly functional. (diff)
downloadwireguard-openbsd-53687b848ae2d8fe2ec14899c4c6c64c58a34349.tar.xz
wireguard-openbsd-53687b848ae2d8fe2ec14899c4c6c64c58a34349.zip
Rename the tls_connect_socket() parameter 'socket' to 's' to avoid
a compiler warning about shadowing a global declaration. OK jsing@
Diffstat (limited to 'lib/libtls/tls_client.c')
-rw-r--r--lib/libtls/tls_client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libtls/tls_client.c b/lib/libtls/tls_client.c
index 57d7262d192..79b1baf648c 100644
--- a/lib/libtls/tls_client.c
+++ b/lib/libtls/tls_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_client.c,v 1.6 2014/12/27 19:35:28 bcook Exp $ */
+/* $OpenBSD: tls_client.c,v 1.7 2015/01/02 16:38:07 bluhm Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -122,11 +122,11 @@ err:
}
int
-tls_connect_socket(struct tls *ctx, int socket, const char *hostname)
+tls_connect_socket(struct tls *ctx, int s, const char *hostname)
{
- ctx->socket = socket;
+ ctx->socket = s;
- return tls_connect_fds(ctx, socket, socket, hostname);
+ return tls_connect_fds(ctx, s, s, hostname);
}
int