From 2ec39c3ada018a04eec591378a43f1e0287d6423 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Feb 2005 08:15:45 +0000 Subject: Include gethrxtime.h. (isaac_seed): Use gethrxtime rather than a mishmash. --- src/shred.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/shred.c b/src/shred.c index b84a75f12..fc02f1340 100644 --- a/src/shred.c +++ b/src/shred.c @@ -27,9 +27,6 @@ - Add -i/--interactive - Reserve -d - Add -L - - Deal with the amazing variety of gettimeofday() implementation bugs. - (Some systems use a one-arg form; still others insist that the timezone - either be NULL or be non-NULL. Whee.) - Add an unlink-all option to emulate rm. */ @@ -106,6 +103,7 @@ #include "xstrtol.h" #include "dirname.h" #include "error.h" +#include "gethrxtime.h" #include "getpagesize.h" #include "human.h" #include "inttostr.h" @@ -587,20 +585,7 @@ isaac_seed (struct isaac_state *s) { gid_t t = getgid (); ISAAC_SEED (s, t); } { -#if 0 && HAVE_GETHRTIME - /* This block if if-0'd out for now because it makes shred - fail with an `illegal instruction' when compiled with Sun's - c89 on Solaris 8 and 9. */ - hrtime_t t = gethrtime (); -#elif HAVE_CLOCK_GETTIME /* POSIX ns-resolution */ - struct timespec t; - clock_gettime (CLOCK_REALTIME, &t); -#elif HAVE_GETTIMEOFDAY - struct timeval t; - gettimeofday (&t, (struct timezone *) 0); -#else - time_t t = time (NULL); -#endif + xtime_t t = gethrxtime (); ISAAC_SEED (s, t); } -- cgit v1.2.3-70-g09d2