Fix newly introduced typos and warnings in ./apps.
authorAndy Polyakov <appro@openssl.org>
Sun, 6 Nov 2005 11:58:22 +0000 (11:58 +0000)
committerAndy Polyakov <appro@openssl.org>
Sun, 6 Nov 2005 11:58:22 +0000 (11:58 +0000)
apps/apps.c
apps/speed.c

index 60bd7ef..ee5edaa 100644 (file)
@@ -2375,6 +2375,7 @@ double app_tminterval(int stop,int usertime)
        FILETIME                now;
        double                  ret=0;
        static ULARGE_INTEGER   tmstart;
+       static int              warning=1;
 #ifdef _WIN32_WINNT
        static HANDLE           proc=NULL;
 
@@ -2394,6 +2395,12 @@ double app_tminterval(int stop,int usertime)
        else
 #endif
                {
+               if (usertime && warning)
+                       {
+                       BIO_printf(bio_err,"To get meaningful results, run "
+                                          "this program on idle system.\n"
+                       warning=1;
+                       }
                SYSTEMTIME systime;
                GetSystemTime(&systime);
                SystemTimeToFileTime(&systime,&now);
@@ -2428,7 +2435,7 @@ double app_tminterval(int stop,int usertime)
 
        if (usertime)           now = rus.tms_utime;
 
-       if (stop==TMSTART)      tmstart = now;
+       if (stop==TM_START)     tmstart = now;
        else                    ret = (now - tmstart)/(double)sysconf(_SC_CLK_TCK);
 
        return (ret);
@@ -2448,7 +2455,7 @@ double app_tminterval(int stop,int usertime)
        if (usertime)           getrusage(RUSAGE_SELF,&rus), now = rus.ru_time;
        else                    gettimeofday(&now,NULL);
 
-       if (stop==TMSTART)      tmstart = now;
+       if (stop==TM_START)     tmstart = now;
        else                    ret = ( (now.tv_sec+now.tv_usec*1e-6)
                                        - (tmstart.tv_sec+tmstart.tv_usec*1e-6) );
 
index 75c3476..9b8365c 100644 (file)
 #define BUFSIZE        ((long)1024*8+1)
 int run=0;
 
-static char ftime_used = 0, times_used = 0, gettimeofday_used = 0, getrusage_used = 0;
 static int mr=0;
 static int usertime=1;
 
@@ -1050,11 +1049,6 @@ int MAIN(int argc, char **argv)
 
        if (usertime == 0 && !mr)
                BIO_printf(bio_err,"You have chosen to measure elapsed time instead of user CPU time.\n");
-       if (usertime <= 0 && !mr)
-               {
-               BIO_printf(bio_err,"To get the most accurate results, try to run this\n");
-               BIO_printf(bio_err,"program when this computer is idle.\n");
-               }
 
 #ifndef OPENSSL_NO_RSA
        for (i=0; i<RSA_NUM; i++)