[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  e631d60280bf5f0ca3ac3ad33d4e785c5082198d (commit)
      from  1556abd0438eeba0160fb5a1fe8c552ed8a63d7e (commit)


- Log -----------------------------------------------------------------
commit e631d60280bf5f0ca3ac3ad33d4e785c5082198d
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Aug 30 03:01:16 2016 +0200

    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 <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1512)
    (cherry picked from commit d485640b8083aea895ecf31b4ea6a338ee561b67)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index f43a578..9c83d64 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");