Tue Apr 14 12:27:02 2015 UTC ()

Eliminate last two cases of u_int*_t in rndpseudo.c.


(riastradh)

diff -r1.29 -r1.30 src/sys/dev/rndpseudo.c

--- src/sys/dev/Attic/rndpseudo.c 2015/04/14 12:25:41	1.29
+++ src/sys/dev/Attic/rndpseudo.c 2015/04/14 12:27:02	1.30

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rndpseudo.c,v 1.29 2015/04/14 12:25:41 riastradh Exp $	*/
+/*	$NetBSD: rndpseudo.c,v 1.30 2015/04/14 12:27:02 riastradh Exp $	*/
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Graff <explorer@flame.org>, Thor Lancelot Simon, and
  * Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.29 2015/04/14 12:25:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.30 2015/04/14 12:27:02 riastradh Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/kmem.h>
 @@ -422,27 +422,27 @@ rnd_read(struct file *fp, off_t *offp, s
 				error = EINTR;
 			goto out;
+		}
+	}
 out:	pool_cache_put(rnd_temp_buffer_cache, buf);
 	return error;
+}
 static int
 rnd_write(struct file *fp, off_t *offp, struct uio *uio,
 	   kauth_cred_t cred, int flags)
+{
-	u_int8_t *bf;
+	uint8_t *bf;
 	int n, ret = 0, estimate_ok = 0, estimate = 0, added = 0;
 	ret = kauth_authorize_device(cred,
 	    KAUTH_DEVICE_RND_ADDDATA, NULL, NULL, NULL, NULL);
 	if (ret) {
 		return (ret);
+	}
 	estimate_ok = !kauth_authorize_device(cred,
 	    KAUTH_DEVICE_RND_ADDDATA_ESTIMATE, NULL, NULL, NULL, NULL);
 	DPRINTF(RND_DEBUG_WRITE,
 	    ("Random: Write of %zu requested\n", uio->uio_resid));
 @@ -590,27 +590,27 @@ rnd_ioctl(struct file *fp, u_long cmd, v
 	switch (cmd) {
 	/*
 	 * Handled in upper layer really, but we have to return zero
 	 * for it to be accepted by the upper layer.
 	 */
 	case FIONBIO:
 	case FIOASYNC:
 		break;
 	case RNDGETENTCNT:
 		mutex_spin_enter(&rndpool_mtx);
-		*(u_int32_t *)addr = rndpool_get_entropy_count(&rnd_pool);
+		*(uint32_t *)addr = rndpool_get_entropy_count(&rnd_pool);
 		mutex_spin_exit(&rndpool_mtx);
 		break;
 	case RNDGETPOOLSTAT:
 		mutex_spin_enter(&rndpool_mtx);
 		rndpool_get_stats(&rnd_pool, addr, sizeof(rndpoolstat_t));
 		mutex_spin_exit(&rndpool_mtx);
 		break;
 	case RNDGETSRCNUM:
 		rst = (rndstat_t *)addr;
 		if (rst->count == 0)