diff options
author | Andy Polyakov <appro@openssl.org> | 2015-09-30 10:27:19 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2015-10-05 09:25:06 +0200 |
commit | 45f1351821a44f4ba7b5c6485277ba7729b6ec4a (patch) | |
tree | 31437e5967fa32045cf3c96cabeb8e79cb424c05 | |
parent | b13fdc4860b5e1bf615b113950788a138e68ae7f (diff) |
Address Windows warnings in apps/.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r-- | apps/opt.c | 3 | ||||
-rw-r--r-- | apps/s_time.c | 23 |
2 files changed, 1 insertions, 25 deletions
diff --git a/apps/opt.c b/apps/opt.c index c7dcc434e8..90a9d84e47 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -80,8 +80,7 @@ static char prog[40]; #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_NETWARE) char *opt_progname(const char *argv0) { - int i; - int n; + size_t i, n; const char *p; char *q; diff --git a/apps/s_time.c b/apps/s_time.c index 91d28c209c..6514fb2197 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -73,10 +73,6 @@ #include <openssl/pem.h> #include "s_apps.h" #include <openssl/err.h> -#ifdef WIN32_STUFF -# include "winmain.h" -# include "wintext.h" -#endif #if !defined(OPENSSL_SYS_MSDOS) # include OPENSSL_UNISTD #endif @@ -166,9 +162,6 @@ int s_time_main(int argc, char **argv) 0, ver; long bytes_read = 0, finishtime = 0; OPTION_CHOICE o; -#ifdef OPENSSL_SYS_WIN32 - int exitNow = 0; /* Set when it's time to exit main */ -#endif meth = TLS_client_method(); verify_depth = 0; @@ -281,14 +274,6 @@ int s_time_main(int argc, char **argv) for (;;) { if (finishtime < (long)time(NULL)) break; -#ifdef WIN32_STUFF - - if (flushWinMsgs(0) == -1) - goto end; - - if (waitingToDie || exitNow) /* we're dead */ - goto end; -#endif if ((scon = doConnection(NULL, host, ctx)) == NULL) goto end; @@ -378,14 +363,6 @@ int s_time_main(int argc, char **argv) if (finishtime < (long)time(NULL)) break; -#ifdef WIN32_STUFF - if (flushWinMsgs(0) == -1) - goto end; - - if (waitingToDie || exitNow) /* we're dead */ - goto end; -#endif - if ((doConnection(scon, host, ctx)) == NULL) goto end; |