-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.59 2008/09/04 08:13:58 fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.61 2008/10/18 11:09:23 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
*
* Revisions :
* $Log: miscutil.c,v $
+ * Revision 1.61 2008/10/18 11:09:23 fabiankeil
+ * Improve seed used by pick_from_range() on mingw32.
+ *
+ * Revision 1.60 2008/09/07 12:35:05 fabiankeil
+ * Add mutex lock support for _WIN32.
+ *
* Revision 1.59 2008/09/04 08:13:58 fabiankeil
* Prepare for critical sections on Windows by adding a
* layer of indirection before the pthread mutex functions.
*********************************************************************/
int strncmpic(const char *s1, const char *s2, size_t n)
{
- if (n <= 0) return(0);
+ if (n <= (size_t)0) return(0);
if (!s1) s1 = "";
if (!s2) s2 = "";
break;
}
- if (--n <= 0) break;
+ if (--n <= (size_t)0) break;
s1++, s2++;
}
err = string_append(target_string, text_to_append);
- free(text_to_append);
+ freez(text_to_append);
return err;
}
long int pick_from_range(long int range)
{
long int number;
+#ifdef _WIN32
+ static unsigned long seed = 0;
+#endif /* def _WIN32 */
assert(range != 0);
assert(range > 0);
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&rand_mutex);
#ifdef _WIN32
- srand((unsigned)(GetCurrentThreadId()+GetTickCount()));
+ if (!seed)
+ {
+ seed = (unsigned long)(GetCurrentThreadId()+GetTickCount());
+ }
+ srand(seed);
+ seed = (unsigned long)((rand() << 16) + rand());
#endif /* def _WIN32 */
- number = rand() % (long int)(range + 1);
+ number = (unsigned long)((rand() << 16) + (rand())) % (unsigned long)(range + 1);
privoxy_mutex_unlock(&rand_mutex);
#else
/*