diff options
author | otto <> | 2016-10-22 14:27:19 +0000 |
---|---|---|
committer | otto <> | 2016-10-22 14:27:19 +0000 |
commit | ad4d53a2423a191bc8fa80e8323aed7a2351f01a (patch) | |
tree | 753c6371e961773835b2f1d31a972b4edbf0b52b | |
parent | d736aadd58d013968b1248f008b87f80771504cc (diff) | |
download | openbsd-ad4d53a2423a191bc8fa80e8323aed7a2351f01a.tar.gz openbsd-ad4d53a2423a191bc8fa80e8323aed7a2351f01a.tar.bz2 openbsd-ad4d53a2423a191bc8fa80e8323aed7a2351f01a.zip |
- fix MALLOC_STATS compile
- redundant cast is redundant
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 09baaf962d..063bdb070d 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: malloc.c,v 1.206 2016/10/21 15:39:31 otto Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.207 2016/10/22 14:27:19 otto Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> |
4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> | 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> |
@@ -286,9 +286,12 @@ wrterror(struct dir_info *d, char *msg, ...) | |||
286 | writev(STDERR_FILENO, iov, 3); | 286 | writev(STDERR_FILENO, iov, 3); |
287 | 287 | ||
288 | #ifdef MALLOC_STATS | 288 | #ifdef MALLOC_STATS |
289 | if (mopts.malloc_stats) | 289 | if (mopts.malloc_stats) { |
290 | int i; | ||
291 | |||
290 | for (i = 0; i < _MALLOC_MUTEXES; i++) | 292 | for (i = 0; i < _MALLOC_MUTEXES; i++) |
291 | malloc_dump(STDERR_FILENO, mopts.malloc_pool[i]); | 293 | malloc_dump(STDERR_FILENO, mopts.malloc_pool[i]); |
294 | } | ||
292 | #endif /* MALLOC_STATS */ | 295 | #endif /* MALLOC_STATS */ |
293 | 296 | ||
294 | errno = saved_errno; | 297 | errno = saved_errno; |
@@ -1042,7 +1045,7 @@ validate_canary(struct dir_info *d, u_char *ptr, size_t sz, size_t allocated) | |||
1042 | 1045 | ||
1043 | if (check_sz > CHUNK_CHECK_LENGTH) | 1046 | if (check_sz > CHUNK_CHECK_LENGTH) |
1044 | check_sz = CHUNK_CHECK_LENGTH; | 1047 | check_sz = CHUNK_CHECK_LENGTH; |
1045 | p = (u_char *)ptr + sz; | 1048 | p = ptr + sz; |
1046 | q = p + check_sz; | 1049 | q = p + check_sz; |
1047 | 1050 | ||
1048 | while (p < q) { | 1051 | while (p < q) { |