some more patches for avoiding problems with non-automatic variables

[openssl.git] / apps / s_time.c

diff --git a/apps/s_time.c b/apps/s_time.c
index 9da140d05a1834b37e51ed94b60897d537500f6a..a43df6bb92ac66b36c423d1be8345ef19ac33810 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -124,11 +124,7 @@
 */
 #ifndef HZ
 #ifndef CLK_TCK
-#ifndef VMS
 #define HZ      100.0
-#else /* VMS */
-#define HZ      100.0
-#endif
 #else /* CLK_TCK */
 #define HZ ((double)CLK_TCK)
 #endif
@@ -252,15 +248,6 @@ static int parseArgs(int argc, char **argv)
 
     verify_depth=0;
     verify_error=X509_V_OK;
-#ifdef FIONBIO
-    t_nbio=0;
-#endif
-
-       apps_startup();
-       s_time_init();
-
-       if (bio_err == NULL)
-               bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
     argc--;
     argv++;
@@ -415,6 +402,12 @@ int MAIN(int argc, char **argv)
        MS_STATIC char buf[1024*8];
        int ver;
 
+       apps_startup();
+       s_time_init();
+
+       if (bio_err == NULL)
+               bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+
 #if !defined(NO_SSL2) && !defined(NO_SSL3)
        s_time_meth=SSLv23_client_method();
 #elif !defined(NO_SSL3)
@@ -668,7 +661,7 @@ static SSL *doConnection(SSL *scon)
                        width=i+1;
                        FD_ZERO(&readfds);
                        FD_SET(i,&readfds);
-                       /* Note: under VMS with SOCKETSHR the third parameter
+                       /* Note: under VMS with SOCKETSHR the 2nd parameter
                         * is currently of type (int *) whereas under other
                         * systems it is (void *) if you don't have a cast it
                         * will choke the compiler: if you do have a cast then