summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-19 12:42:01 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:49:13 +0000
commit00ea17f9d76aec3d7a44cff263e74291b6294ac9 (patch)
tree76705fd033e07ab4273fc318f6d4a8eb6c70eeb8 /demos
parent3e8042c38f3a4be8933b0f773fd1e79f50e12e56 (diff)
Fix source where indent will not be able to cope
Conflicts: apps/ciphers.c ssl/s3_pkt.c Conflicts: crypto/ec/ec_curve.c Conflicts: crypto/ec/ec_curve.c ssl/s3_clnt.c ssl/s3_srvr.c ssl/ssl_sess.c Conflicts: apps/ciphers.c crypto/bn/bn.h crypto/ec/ec_curve.c ssl/t1_enc.c ssl/t1_lib.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'demos')
-rw-r--r--demos/easy_tls/easy-tls.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index 64090c41ca..b433036715 100644
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -809,8 +809,9 @@ max(int a, int b)
return a > b ? a : b;
}
+/* timeout, -1 means no timeout */
static void
-tls_sockets_select(int read_select_1, int read_select_2, int write_select_1, int write_select_2, int seconds /* timeout, -1 means no timeout */)
+tls_sockets_select(int read_select_1, int read_select_2, int write_select_1, int write_select_2, int seconds)
{
int maxfd, n;
fd_set reads, writes;