Module Name: src Committed By: christos Date: Thu Jul 10 21:13:52 UTC 2014
Modified Files: src/sys/kern: subr_extent.c subr_prof.c sys_module.c Log Message: don't cast void * in c. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/kern/subr_extent.c cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_prof.c cvs rdiff -u -r1.16 -r1.17 src/sys/kern/sys_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_extent.c diff -u src/sys/kern/subr_extent.c:1.75 src/sys/kern/subr_extent.c:1.76 --- src/sys/kern/subr_extent.c:1.75 Sun Jan 29 06:14:49 2012 +++ src/sys/kern/subr_extent.c Thu Jul 10 17:13:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_extent.c,v 1.75 2012/01/29 11:14:49 para Exp $ */ +/* $NetBSD: subr_extent.c,v 1.76 2014/07/10 21:13:52 christos Exp $ */ /*- * Copyright (c) 1996, 1998, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_extent.c,v 1.75 2012/01/29 11:14:49 para Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_extent.c,v 1.76 2014/07/10 21:13:52 christos Exp $"); #ifdef _KERNEL #include "opt_lockdebug.h" @@ -283,7 +283,7 @@ extent_create(const char *name, u_long s LIST_INSERT_HEAD(&fex->fex_freelist, rp, er_link); } } else { - ex = (struct extent *)kmem_alloc(sizeof(struct extent), + ex = kmem_alloc(sizeof(*ex), (flags & EX_WAITOK) ? KM_SLEEP : KM_NOSLEEP); if (ex == NULL) return (NULL); Index: src/sys/kern/subr_prof.c diff -u src/sys/kern/subr_prof.c:1.46 src/sys/kern/subr_prof.c:1.47 --- src/sys/kern/subr_prof.c:1.46 Tue Feb 25 13:30:11 2014 +++ src/sys/kern/subr_prof.c Thu Jul 10 17:13:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_prof.c,v 1.46 2014/02/25 18:30:11 pooka Exp $ */ +/* $NetBSD: subr_prof.c,v 1.47 2014/07/10 21:13:52 christos Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_prof.c,v 1.46 2014/02/25 18:30:11 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_prof.c,v 1.47 2014/07/10 21:13:52 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,7 +86,7 @@ kmstartup(void) else if (p->tolimit > MAXARCS) p->tolimit = MAXARCS; p->tossize = p->tolimit * sizeof(struct tostruct); - cp = (char *)malloc(p->kcountsize + p->fromssize + p->tossize, + cp = malloc(p->kcountsize + p->fromssize + p->tossize, M_GPROF, M_NOWAIT | M_ZERO); if (cp == 0) { printf("No memory for profiling.\n"); Index: src/sys/kern/sys_module.c diff -u src/sys/kern/sys_module.c:1.16 src/sys/kern/sys_module.c:1.17 --- src/sys/kern/sys_module.c:1.16 Thu Jul 10 15:21:46 2014 +++ src/sys/kern/sys_module.c Thu Jul 10 17:13:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_module.c,v 1.16 2014/07/10 19:21:46 maxv Exp $ */ +/* $NetBSD: sys_module.c,v 1.17 2014/07/10 21:13:52 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.16 2014/07/10 19:21:46 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.17 2014/07/10 21:13:52 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -77,7 +77,7 @@ handle_modctl_load(modctl_load_t *ml) } propslen = ml->ml_propslen + 1; - props = (char *)kmem_alloc(propslen, KM_SLEEP); + props = kmem_alloc(propslen, KM_SLEEP); if (props == NULL) { error = ENOMEM; goto out1;