Changeset 539 for trunk/src/sh_files.c

Timestamp:

Jan 7, 2019, 8:03:37 PM (6 years ago)

Author:

katerina

Message:

Fixes for tickets #431 (OpenBSD compatibility) and #432 (compiler warnings).

File:

• trunk/src/sh_files.c (modified) (3 diffs)

trunk/src/sh_files.c

@@ -2046 +2046 @@
 #endif
 
+/* This is the LCG from Numerical Recipies. Deterministic. 
+ */
+static unsigned int simple_rand(unsigned int * state)
+{
+  *state = 1664525 * (*state) + 1013904223;
+  return *state;
+}
+
 void * sh_dummy_dirlist;
 void * sh_dummy_tmpcat;
@@ -2290 +2298 @@
     BREAKEXIT(sh_derr);
 
-#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_RAND_R)
-    if (0 == (rand_r(&state) % 5)) (void) sh_derr();
-#else
-    if (0 == state * (rand() % 5)) (void) sh_derr();
-#endif
+    if (0 == (simple_rand(&state) % 5)) (void) sh_derr();
     
     /* ---- Check the file. ---- 
@@ -2637 +2641 @@
   BREAKEXIT(sh_derr);
 
-#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_RAND_R)
-  if (0 == (rand_r(&state) % 2)) (void) sh_derr();
-#else
-  if (0 == state * (rand() % 2)) (void) sh_derr();
-#endif
+  if (0 == (simple_rand(&state) % 2)) (void) sh_derr();
 
   if (dirName && infileName && (dirName[0] == '/') && (dirName[1] == '\0')