summaryrefslogtreecommitdiff
path: root/sys/kern/kern_malloc.c
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2007-03-25 02:38:12 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2007-03-25 02:38:12 +0000
commit4381160c5ac0b1946d2b26b4adcff02a55080bd1 (patch)
tree0dd5953c210d15d4f5cc31cbe432feac8bf920c5 /sys/kern/kern_malloc.c
parent0201ac5085d6fc2d714b1f3d6607606aab57339c (diff)
remove a few void * casts that are useless
Diffstat (limited to 'sys/kern/kern_malloc.c')
-rw-r--r--sys/kern/kern_malloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 19192639294..8b913a9a10a 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc.c,v 1.66 2007/01/12 07:41:31 art Exp $ */
+/* $OpenBSD: kern_malloc.c,v 1.67 2007/03/25 02:38:11 tedu Exp $ */
/* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */
/*
@@ -155,7 +155,7 @@ malloc(unsigned long size, int type, int flags)
#ifdef MALLOC_DEBUG
if (debug_malloc(size, type, flags, (void **)&va))
- return ((void *) va);
+ return (va);
#endif
if (size > 65535 * PAGE_SIZE) {
@@ -177,7 +177,7 @@ malloc(unsigned long size, int type, int flags)
while (ksp->ks_memuse >= ksp->ks_limit) {
if (flags & M_NOWAIT) {
splx(s);
- return ((void *) NULL);
+ return (NULL);
}
if (ksp->ks_limblocks < 65535)
ksp->ks_limblocks++;
@@ -325,7 +325,7 @@ out:
out:
#endif
splx(s);
- return ((void *) va);
+ return (va);
}
/*