From 53687b848ae2d8fe2ec14899c4c6c64c58a34349 Mon Sep 17 00:00:00 2001 From: bluhm Date: Fri, 2 Jan 2015 16:38:07 +0000 Subject: [PATCH] Rename the tls_connect_socket() parameter 'socket' to 's' to avoid a compiler warning about shadowing a global declaration. OK jsing@ --- lib/libtls/tls_client.c | 8 ++++---- 1 file 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 * @@ -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 -- 2.20.1