Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move entropy_count into the scope where it is used.

Browse Source 
Omit now-unused definition.

XXX This code probably shouldn't be under DIAGNOSTIC...  It is
significantly more than just an assertion.
This commit is contained in:
riastradh 2016-02-17 01:23:32 +00:00
parent 25f6b3cbaa
commit 7e7551b30d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_rndq.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_rndq.c,v 1.79 2016/02/17 01:09:49 riastradh Exp $ */ /* $NetBSD: kern_rndq.c,v 1.80 2016/02/17 01:23:32 riastradh Exp $ */
/*- /*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc. * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.79 2016/02/17 01:09:49 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.80 2016/02/17 01:23:32 riastradh Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/atomic.h> #include <sys/atomic.h>
@ -1161,7 +1161,6 @@ static uint32_t
rnd_extract_data(void *p, uint32_t len, uint32_t flags) rnd_extract_data(void *p, uint32_t len, uint32_t flags)
{ {
static int timed_in; static int timed_in;
int entropy_count;
uint32_t retval; uint32_t retval;
mutex_spin_enter(&rnd_global.lock); mutex_spin_enter(&rnd_global.lock);
@ -1184,7 +1183,8 @@ rnd_extract_data(void *p, uint32_t len, uint32_t flags)
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
while (!rnd_tested) { while (!rnd_tested) {
entropy_count = rndpool_get_entropy_count(&rnd_global.pool); int entropy_count =
rndpool_get_entropy_count(&rnd_global.pool);
rnd_printf_verbose("rnd: starting statistical RNG test," rnd_printf_verbose("rnd: starting statistical RNG test,"
" entropy = %d.\n", " entropy = %d.\n",
entropy_count); entropy_count);
@ -1224,7 +1224,6 @@ rnd_extract_data(void *p, uint32_t len, uint32_t flags)
rnd_tested++; rnd_tested++;
} }
#endif #endif
entropy_count = rndpool_get_entropy_count(&rnd_global.pool);
retval = rndpool_extract_data(&rnd_global.pool, p, len, flags); retval = rndpool_extract_data(&rnd_global.pool, p, len, flags);
mutex_spin_exit(&rnd_global.lock); mutex_spin_exit(&rnd_global.lock);