generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Address Windows warnings in apps/.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Andy Polyakov 2015-09-30 10:27:19 +02:00
parent b13fdc4860
commit 45f1351821
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/opt.c
View File

@ -80,8 +80,7 @@ static char prog[40];
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_NETWARE) #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_NETWARE)
char *opt_progname(const char *argv0) char *opt_progname(const char *argv0)
{ {
int i; size_t i, n;
int n;
const char *p; const char *p;
char *q; char *q;

23
apps/s_time.c
View File

@ -73,10 +73,6 @@
#include <openssl/pem.h> #include <openssl/pem.h>
#include "s_apps.h" #include "s_apps.h"
#include <openssl/err.h> #include <openssl/err.h>
#ifdef WIN32_STUFF
# include "winmain.h"
# include "wintext.h"
#endif
#if !defined(OPENSSL_SYS_MSDOS) #if !defined(OPENSSL_SYS_MSDOS)
# include OPENSSL_UNISTD # include OPENSSL_UNISTD
#endif #endif
@ -166,9 +162,6 @@ int s_time_main(int argc, char **argv)
0, ver; 0, ver;
long bytes_read = 0, finishtime = 0; long bytes_read = 0, finishtime = 0;
OPTION_CHOICE o; OPTION_CHOICE o;
#ifdef OPENSSL_SYS_WIN32
int exitNow = 0; /* Set when it's time to exit main */
#endif
meth = TLS_client_method(); meth = TLS_client_method();
verify_depth = 0; verify_depth = 0;
@ -281,14 +274,6 @@ int s_time_main(int argc, char **argv)
for (;;) { for (;;) {
if (finishtime < (long)time(NULL)) if (finishtime < (long)time(NULL))
break; 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) if ((scon = doConnection(NULL, host, ctx)) == NULL)
goto end; goto end;
@ -378,14 +363,6 @@ int s_time_main(int argc, char **argv)
if (finishtime < (long)time(NULL)) if (finishtime < (long)time(NULL))
break; 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) if ((doConnection(scon, host, ctx)) == NULL)
goto end; goto end;