Module: ngircd.git Branch: master Commit: 7f8d0ea5a3e927b8b6dd84eae63849ae17cdf5ae URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7f8d0ea5a... Author: Alexander Barton <alex@barton.de> Date: Sun Jun 26 23:39:20 2011 +0200 Use srand()/rand() instead of srandom()/random(); seems to be more portable --- src/ngircd/irc-login.c | 2 +- src/ngircd/ngircd.c | 6 +++--- src/ngircd/proc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 2e99d66..067703a 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -273,7 +273,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) #ifndef STRICT_RFC if (Conf_AuthPing) { - Conn_SetAuthPing(Client_Conn(Client), random()); + Conn_SetAuthPing(Client_Conn(Client), rand()); IRC_WriteStrClient(Client, "PING :%ld", Conn_GetAuthPing(Client_Conn(Client))); LogDebug("Connection %d: sent AUTH PING %ld ...", diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 58383cf..500d128 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -576,13 +576,13 @@ Random_Init_Kern(const char *file) if (read(fd, &seed, sizeof(seed)) == sizeof(seed)) ret = true; close(fd); - srandom(seed); + srand(seed); } return ret; } /** - * Initialize libc random(3) number generator + * Initialize libc rand(3) number generator */ static void Random_Init(void) @@ -593,7 +593,7 @@ Random_Init(void) return; if (Random_Init_Kern("/dev/arandom")) return; - srandom(random() ^ getpid() ^ time(NULL)); + srand(rand() ^ getpid() ^ time(NULL)); } diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index 217eb6d..54b3919 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -62,7 +62,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; } - seed = (unsigned int)random(); + seed = (unsigned int)rand(); pid = fork(); switch (pid) { case -1: @@ -73,7 +73,7 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; case 0: /* New child process: */ - srandom(seed ^ (unsigned int)time(NULL) ^ getpid()); + srand(seed ^ (unsigned int)time(NULL) ^ getpid()); Signals_Exit(); signal(SIGTERM, Proc_GenericSignalHandler); signal(SIGALRM, Proc_GenericSignalHandler);