summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2017-10-05 04:44:49 +0000
committerotto <otto@openbsd.org>2017-10-05 04:44:49 +0000
commit95d8e5b2e1b2be9d12fbfcdb2bd64f4d371d991b (patch)
treecae3b720f8d5be96aad918718b0b18d0fe44eb06 /lib/libc/stdlib/malloc.c
parentUse dprintf instead of snprintf/write (diff)
downloadwireguard-openbsd-95d8e5b2e1b2be9d12fbfcdb2bd64f4d371d991b.tar.xz
wireguard-openbsd-95d8e5b2e1b2be9d12fbfcdb2bd64f4d371d991b.zip
do not return f() where f is a void function; loop var type fix
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 0c223988415..0d43ad8a13f 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc.c,v 1.233 2017/10/05 04:41:43 otto Exp $ */
+/* $OpenBSD: malloc.c,v 1.234 2017/10/05 04:44:49 otto Exp $ */
/*
* Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
* Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -733,7 +733,7 @@ alloc_chunk_info(struct dir_info *d, int bits)
if (LIST_EMPTY(&d->chunk_info_list[bits])) {
char *q;
- int i;
+ size_t i;
q = MMAP(MALLOC_PAGESIZE);
if (q == MAP_FAILED)
@@ -1456,8 +1456,9 @@ freezero(void *ptr, size_t sz)
if (ptr == NULL)
return;
- if (!mopts.internal_funcs)
- return freezero_p(ptr, sz);
+ if (!mopts.internal_funcs) {
+ freezero_p(ptr, sz);
+ }
d = getpool();
if (d == NULL)