Remove the needless done_init variables from tests (#4505)

This change should settle CIDs 1504383-150439, making clear to
Coverity that rand_ctx is indeed initialized.

diff --git a/src/lib/util/heap_tests.c b/src/lib/util/heap_tests.c
index 6bbca78eba7d56bb2b921f6ea4bffb2e0ba76d54..04e4f1313b962b7d8f58c0f1d33bb7cc1eb2faed 100644 (file)
--- a/src/lib/util/heap_tests.c
+++ b/src/lib/util/heap_tests.c
@@ -47,13 +47,9 @@ static void heap_test(int skip)
        int             left;
        int             ret;
        fr_fast_rand_t  rand_ctx;
-       static bool     done_init = false;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        hp = fr_heap_alloc(NULL, heap_cmp, heap_thing, heap, 0);
        TEST_CHECK(hp != NULL);
@@ -150,13 +146,9 @@ static void heap_test_order(void)
        unsigned int    count = 0;
        int             ret;
        fr_fast_rand_t  rand_ctx;
-       static bool     done_init = false;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        hp = fr_heap_alloc(NULL, heap_cmp, heap_thing, heap, 0);
        TEST_CHECK(hp != NULL);
@@ -233,13 +225,9 @@ static void heap_cycle(void)
        int             ret;
        fr_time_t       start_insert, start_remove, start_swap, end;
        fr_fast_rand_t  rand_ctx;
-       static bool     done_init = false;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        hp = fr_heap_alloc(NULL, heap_cmp, heap_thing, heap, 0);
        TEST_CHECK(hp != NULL);

diff --git a/src/lib/util/lst_tests.c b/src/lib/util/lst_tests.c
index 4caa738b8e62d85f97af1c0a2bdcdffd96d51d22..9abd12368c6b0854c2c9df2de7a144e465cb1da6 100644 (file)
--- a/src/lib/util/lst_tests.c
+++ b/src/lib/util/lst_tests.c
@@ -98,13 +98,6 @@ static void lst_test(int skip)
        unsigned int    left;
        int             ret;
 
-       static bool     done_init = false;
-
-       if (!done_init) {
-               srand((unsigned int)time(NULL));
-               done_init = true;
-       }
-
        lst = fr_lst_alloc(NULL, lst_cmp, lst_thing, idx, 0);
        TEST_CHECK(lst != NULL);
 
@@ -178,15 +171,11 @@ static void lst_stress_realloc(void)
        fr_heap_t       *hp;
        lst_thing       *lst_array, *hp_array;
        fr_fast_rand_t  rand_ctx;
-       static bool     done_init = false;
        int             ret;
        lst_thing       *from_lst, *from_hp;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        lst = fr_lst_alloc(NULL, lst_cmp, lst_thing, idx, 0);
        TEST_CHECK(lst != NULL);
@@ -256,14 +245,10 @@ static void lst_burn_in(void)
        fr_lst_t        *lst = NULL;
        lst_thing       *array = NULL;
        fr_fast_rand_t  rand_ctx;
-       static bool     done_init = false;
        int             insert_count = 0;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        array = calloc(BURN_IN_OPS, sizeof(lst_thing));
        for (unsigned int i = 0; i < BURN_IN_OPS; i++) array[i].data = fr_fast_rand(&rand_ctx) % 65537;
@@ -312,13 +297,6 @@ static void lst_cycle(void)
        int             ret;
        fr_time_t       start_insert, start_remove, start_swap, end;
 
-       static bool     done_init = false;
-
-       if (!done_init) {
-               srand((unsigned int)time(NULL));
-               done_init = true;
-       }
-
        lst = fr_lst_alloc(NULL, lst_cmp, lst_thing, idx, 0);
        TEST_CHECK(lst != NULL);
 

diff --git a/src/lib/util/minmax_heap_tests.c b/src/lib/util/minmax_heap_tests.c
index c3b2216f5d002f187d2213c6d7a687dced4123da..aa0aa6659b5787f93507b4592d3c606f6b3892ad 100644 (file)
--- a/src/lib/util/minmax_heap_tests.c
+++ b/src/lib/util/minmax_heap_tests.c
@@ -132,13 +132,9 @@ static void minmax_heap_test(int skip)
        int                     left;
        int                     ret;
        fr_fast_rand_t          rand_ctx;
-       static bool             done_init = false;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        hp = fr_minmax_heap_alloc(NULL, minmax_heap_cmp, minmax_heap_thing, idx, 0);
        TEST_CHECK(hp != NULL);
@@ -227,14 +223,10 @@ static void minmax_heap_burn_in(void)
        fr_minmax_heap_t        *hp = NULL;
        minmax_heap_thing       *array = NULL;
        fr_fast_rand_t          rand_ctx;
-       static bool             done_init = false;
        int                     insert_count = 0;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        array = calloc(BURN_IN_OPS, sizeof(minmax_heap_thing));
        for (unsigned int i = 0; i < BURN_IN_OPS; i++) array[i].data = fr_fast_rand(&rand_ctx) % 65537;
@@ -290,13 +282,9 @@ static void minmax_heap_test_order(void)
        unsigned int            count;
        int                     ret;
        fr_fast_rand_t          rand_ctx;
-       static bool     done_init = false;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        hp = fr_minmax_heap_alloc(NULL, minmax_heap_cmp, minmax_heap_thing, idx, 0);
        TEST_CHECK(hp != NULL);
@@ -529,13 +517,9 @@ static void minmax_heap_cycle(void)
        int                     ret;
        fr_time_t               start_insert, start_remove, start_swap, end;
        fr_fast_rand_t          rand_ctx;
-       static bool             done_init = false;
 
-       if (!done_init) {
-               rand_ctx.a = fr_rand();
-               rand_ctx.b = fr_rand();
-               done_init = true;
-       }
+       rand_ctx.a = fr_rand();
+       rand_ctx.b = fr_rand();
 
        hp = fr_minmax_heap_alloc(NULL, minmax_heap_cmp, minmax_heap_thing, idx, 0);
        TEST_CHECK(hp != NULL);