From e631d60280bf5f0ca3ac3ad33d4e785c5082198d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 30 Aug 2016 03:01:16 +0200 Subject: [PATCH] s_client: avoid warning on Windows/MS-DOS systems it appears when using gcc/mingw: ``` apps/s_client.c:815:9: warning: variable 'at_eof' set but not used [-Wunused-but-set-variable] int at_eof = 0; ^~~~~~ ``` Reviewed-by: Matt Caswell Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1512) (cherry picked from commit d485640b8083aea895ecf31b4ea6a338ee561b67) --- apps/s_client.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/s_client.c b/apps/s_client.c index f43a578b76..9c83d64742 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -812,7 +812,9 @@ int s_client_main(int argc, char **argv) int socket_family = AF_UNSPEC, socket_type = SOCK_STREAM; int starttls_proto = PROTO_OFF, crl_format = FORMAT_PEM, crl_download = 0; int write_tty, read_tty, write_ssl, read_ssl, tty_on, ssl_pending; +#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) int at_eof = 0; +#endif int read_buf_len = 0; int fallback_scsv = 0; long randamt = 0; @@ -2393,8 +2395,10 @@ int s_client_main(int argc, char **argv) } else i = raw_read_stdin(cbuf, BUFSIZZ); +#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) if (i == 0) at_eof = 1; +#endif if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q' && cmdletters))) { BIO_printf(bio_err, "DONE\n"); -- 2.25.1