diff options
| author | christos <christos@NetBSD.org> | 2011-05-18 01:59:39 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2011-05-18 01:59:39 +0000 |
| commit | 9c5b5918880195a2502f532ddd1dce8b6948efd4 (patch) | |
| tree | 779cdb3006694e00f99965784d1b52d7cee0358e /lib/libc/stdlib/malloc.c | |
| parent | f97bd517407fdcbe4152549abc4f2f4f861119d4 (diff) | |
cleanup saving and restoring errno, and make it similar.
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index c89518ea0d7..9cf6536201e 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: malloc.c,v 1.53 2011/05/13 23:11:00 christos Exp $ */ +/* $NetBSD: malloc.c,v 1.54 2011/05/18 01:59:39 christos Exp $ */ /* * ---------------------------------------------------------------------------- @@ -90,7 +90,7 @@ void utrace(struct ut *, int); #include <sys/cdefs.h> #include "extern.h" #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: malloc.c,v 1.53 2011/05/13 23:11:00 christos Exp $"); +__RCSID("$NetBSD: malloc.c,v 1.54 2011/05/18 01:59:39 christos Exp $"); #endif /* LIBC_SCCS and not lint */ int utrace(const char *, void *, size_t); @@ -447,7 +447,7 @@ malloc_init(void) char b[64]; size_t i; ssize_t j; - int save_errno = errno; + int serrno = errno; /* * Compute page-size related variables. @@ -467,12 +467,9 @@ malloc_init(void) for (i = 0; i < 3; i++) { if (i == 0) { - int serrno = errno; j = readlink("/etc/malloc.conf", b, sizeof b - 1); - if (j == -1) { - errno = serrno; + if (j == -1) continue; - } b[j] = '\0'; p = b; } else if (i == 1 && issetugid() == 0) { @@ -550,7 +547,7 @@ malloc_init(void) */ px = imalloc(sizeof *px); - errno = save_errno; + errno = serrno; } /* |
