fixup! Set a constant amount of runtime on more perf tests

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
(Merged from #33)

Author: andrewkdinh

source/evp_fetch.c

@@ -281,8 +281,7 @@ void do_fetch(size_t num)
         }
         counts[num]++;
         time = ossl_time_now();
-    }
-    while (time.t < max_time.t);
+    } while (time.t < max_time.t);
 }
 
 int main(int argc, char *argv[])
@@ -292,6 +291,7 @@ int main(int argc, char *argv[])
     double av;
     int terse = 0;
     size_t i;
+    int j;
     int rc = EXIT_FAILURE;
     char *fetch_type = getenv("EVP_FETCH_TYPE");
     int opt;
@@ -377,8 +377,8 @@ int main(int argc, char *argv[])
         goto out;
     }
 
-    for (i = 0; i < threadcount; i++)
-        total_count += counts[i];
+    for (j = 0; j < threadcount; j++)
+        total_count += counts[j];
 
     /*
      * EVP_fetch_* calls are pretty fast, running in

source/evp_setpeer.c

@@ -130,8 +130,6 @@ static void usage(char * const argv[])
 int main(int argc, char *argv[])
 {
     OSSL_TIME duration;
-    size_t total_count = 0;
-    double avcalltime;
     int terse = 0;
     int rc = EXIT_FAILURE;
     size_t i;

source/pkeyread.c

@@ -45,7 +45,6 @@ static void do_pemread(size_t num)
     EVP_PKEY *key;
     BIO *pem;
     size_t i;
-    size_t len;
     OSSL_TIME time;
 
     if (sample_id >= SAMPLE_ALL) {
@@ -93,8 +92,6 @@ static void do_pemread(size_t num)
 
 static int sample_id_to_evp(int sample_id)
 {
-    int rv;
-
     if ((sample_id < 0) || (sample_id >= SAMPLE_ALL))
         return EVP_PKEY_NONE;
 
@@ -105,10 +102,7 @@ static void do_derread(size_t num)
 {
     const unsigned char *keydata;
     size_t keydata_sz;
-    const unsigned char *pk_buf = NULL;
-    int pk_buf_len;
     EVP_PKEY *pkey = NULL;
-    int i;
     OSSL_TIME time;
 
     if (sample_id >= SAMPLE_ALL) {

source/providerdoall.c

@@ -42,7 +42,6 @@ static int threadcount;
 
 static void do_providerdoall(size_t num)
 {
-    size_t i;
     int count;
     OSSL_TIME time;
 

source/randbytes.c

@@ -111,5 +111,5 @@ int main(int argc, char *argv[])
     rc = EXIT_SUCCESS;
 out:
     OPENSSL_free(counts);
-    return EXIT_SUCCESS;
+    return rc;
 }