X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_open.c;fp=src%2Frrd_open.c;h=f74c6d8a677ea8c0e3068f271b8d970f61441f81;hp=16545145ba214444219fbd09b72e3765ae2d7a8e;hb=2f0b984b0dfee0a8ab2cb1d41670f40a07ec5cdb;hpb=18ff159c38b7d919bafbdcc46d03c3f83c17476f diff --git a/src/rrd_open.c b/src/rrd_open.c index 1654514..f74c6d8 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -16,10 +16,6 @@ #define MEMBLK 8192 #ifdef WIN32 -# define random() rand() -# define srandom(x) srand(x) -# define getpid() 0 - #define _LK_UNLCK 0 /* Unlock */ #define _LK_LOCK 1 /* Lock */ #define _LK_NBLCK 2 /* Non-blocking lock */ @@ -78,10 +74,6 @@ #endif #endif -long int rra_random_row( - rra_def_t *); - - /* Open a database file, return its header and an open filehandle, * positioned to the first cdp in the first rra. * In the error path of rrd_open, only rrd_free(&rrd) has to be called @@ -763,19 +755,5 @@ unsigned long rrd_select_initial_row( rra_def_t *rra ) { - return rra_random_row(rra); -} - -static int rand_init = 0; - -long int rra_random_row( - rra_def_t *rra) -{ - if (!rand_init) { - srandom((unsigned int) time(NULL) + (unsigned int) getpid()); - rand_init++; - } - - return random() % rra->row_cnt; + return rrd_random() % rra->row_cnt; } -