tests: moving random string function to common.c

3 files changed, 47 insertions, 36 deletions

diff --git a/tests/common.c b/tests/common.c
index e1b0401..68ab788 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -39,9 +39,11 @@
 #pragma mark - Headers
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <strings.h>
+#include <assert.h>
 
 #include "common.h"
 
@@ -534,4 +536,38 @@ void our_verbose(int opts, const char * fmt, ...)
    return;
 }
 
+
+//------------------//
+// string functions //
+//------------------//
+#pragma mark string functions
+
+char * our_random_str(size_t min, size_t max)
+{
+   char *      str;
+   size_t      len;
+   size_t      pos;
+   static int  count = 0;
+
+   assert(min <= max);
+
+   len = ((max - min)) ? ((unsigned)random() % (max - min)) : 0;
+   len += min;
+   if (len < sizeof(int))
+      len = sizeof(int);
+
+   if ((str = malloc(len+1)) == NULL)
+      return(NULL);
+   str[len] = '\0';
+
+   for(pos = 0; (pos < (len-sizeof(int))); pos++)
+      str[pos] = (random() % 26) + 'a';
+
+   snprintf(&str[pos], (len-pos+1), "%04xu", (~count)&0xffff);
+
+   count++;
+
+   return(str);
+}
+
 /* end of source */
diff --git a/tests/common.h b/tests/common.h
index a298d73..1e83957 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -116,4 +116,14 @@ void our_print(int opts, const char * fmt, ...);
 void our_verbose(int opts, const char * fmt, ...);
 
 
+//------------------//
+// string functions //
+//------------------//
+#pragma mark string functions
+
+char *
+our_random_str(
+         size_t                        min,
+         size_t                        max );
+
 #endif /* end of header */
diff --git a/tests/test-array.c b/tests/test-array.c
index 283d71f..e8c9068 100644
--- a/tests/test-array.c
+++ b/tests/test-array.c
@@ -183,12 +183,6 @@ my_test_search(
          size_t                        len );
 
 
-char *
-my_random_str(
-         size_t                        min,
-         size_t                        max );
-
-
 /////////////////
 //             //
 //  Functions  //
@@ -299,7 +293,7 @@ int main( int argc, char * argv[] )
    {
       data[pos].value = (int)(~pos);
       data[pos].opts  = (int)pos;
-      data[pos].name  = (pos < len) ? strdup(test_strs[pos]) : my_random_str(8, 8);
+      data[pos].name  = (pos < len) ? strdup(test_strs[pos]) : our_random_str(8, 8);
       if (!(data[pos].name))
       {
          for(; (pos > 0); pos--)
@@ -587,35 +581,6 @@ my_compar_opts(
 }
 
 
-char * my_random_str(size_t min, size_t max)
-{
-   char *      str;
-   size_t      len;
-   size_t      pos;
-   static int  count = 0;
-
-   assert(min <= max);
-
-   len = ((max - min)) ? ((unsigned)random() % (max - min)) : 0;
-   len += min;
-   if (len < sizeof(int))
-      len = sizeof(int);
-
-   if ((str = malloc(len+1)) == NULL)
-      return(NULL);
-   str[len] = '\0';
-
-   for(pos = 0; (pos < (len-sizeof(int))); pos++)
-      str[pos] = (random() % 26) + 'a';
-
-   snprintf(&str[pos], (len-pos+1), "%04xu", (~count)&0xffff);
-
-   count++;
-
-   return(str);
-}
-
-
 int
 my_test_insert(
          int                           opts,