diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-10-14 09:23:13 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-10-14 09:23:47 +0200 |
commit | ab6fede713fde8c432927dd5f61f41e797fcf66b (patch) | |
tree | 8abb8d8cf8bebab43c9c57dbd6a6c709d25508f0 | |
parent | 8c7f78352e03ebc3d82a8a111412da5694c95faf (diff) | |
download | gnutls-ab6fede713fde8c432927dd5f61f41e797fcf66b.tar.gz |
simplified getrusage code; the failure check code wasn't needed
-rw-r--r-- | lib/nettle/rnd.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c index 1d4a64a94c..d5b5313a22 100644 --- a/lib/nettle/rnd.c +++ b/lib/nettle/rnd.c @@ -91,8 +91,6 @@ __attribute__((packed)) # else # define ARG_RUSAGE RUSAGE_SELF # endif - -static int rusage_arg = ARG_RUSAGE; #endif static void _rnd_get_event(struct event_st *e) @@ -102,11 +100,9 @@ static void _rnd_get_event(struct event_st *e) gettime(&e->now); #ifdef HAVE_GETRUSAGE - if (rusage_arg != -1) { - if (getrusage(rusage_arg, &e->rusage) < 0) { - _gnutls_debug_log("getrusage failed: %s\n", - strerror(errno)); - } + if (getrusage(ARG_RUSAGE, &e->rusage) < 0) { + _gnutls_debug_log("getrusage failed: %s\n", + strerror(errno)); } #endif @@ -409,18 +405,6 @@ static int wrap_nettle_rnd_init(void **ctx) return ret; } -#ifdef HAVE_GETRUSAGE - { - struct rusage usage; - if (getrusage(rusage_arg, &usage) < 0) { - rusage_arg = RUSAGE_SELF; - if (getrusage(rusage_arg, &usage) < 0) { - rusage_arg = -1; - } - } - } -#endif - yarrow256_init(&yctx, SOURCES, ysources); _rnd_get_event(&event); |