diff options
| author | jasone <jasone@FreeBSD.org> | 2000-01-12 09:23:48 +0000 |
|---|---|---|
| committer | jasone <jasone@FreeBSD.org> | 2000-01-12 09:23:48 +0000 |
| commit | 75903038bc52105bc7479fe5f2b75f22f10c1c50 (patch) | |
| tree | c9e28eda650bbd7eaa3eb22c8d7c75d00a96a451 /lib/libc/stdlib/malloc.c | |
| parent | 688bb99b3f790aad607b949661d0361486bbe346 (diff) | |
| download | FreeBSD-src-75903038bc52105bc7479fe5f2b75f22f10c1c50.zip FreeBSD-src-75903038bc52105bc7479fe5f2b75f22f10c1c50.tar.gz | |
Add three-tier symbol naming in support of POSIX thread cancellation
points. For library functions, the pattern is __sleep() <--
_libc_sleep() <-- sleep(). The arrows represent weak aliases. For
system calls, the pattern is _read() <-- _libc_read() <-- read().
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 02d9364..bf41790 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -72,7 +72,7 @@ static int fdzero; # define MMAP_FD fdzero # define INIT_MMAP() \ - { if ((fdzero=open("/dev/zero", O_RDWR, 0000)) == -1) \ + { if ((fdzero = _libc_open("/dev/zero", O_RDWR, 0000)) == -1) \ wrterror("open of /dev/zero"); } # define MADV_FREE MADV_DONTNEED #endif /* __sparc__ */ @@ -275,10 +275,10 @@ static void wrterror(char *p) { char *q = " error: "; - write(STDERR_FILENO, __progname, strlen(__progname)); - write(STDERR_FILENO, malloc_func, strlen(malloc_func)); - write(STDERR_FILENO, q, strlen(q)); - write(STDERR_FILENO, p, strlen(p)); + _libc_write(STDERR_FILENO, __progname, strlen(__progname)); + _libc_write(STDERR_FILENO, malloc_func, strlen(malloc_func)); + _libc_write(STDERR_FILENO, q, strlen(q)); + _libc_write(STDERR_FILENO, p, strlen(p)); suicide = 1; abort(); } @@ -289,13 +289,12 @@ wrtwarning(char *p) char *q = " warning: "; if (malloc_abort) wrterror(p); - write(STDERR_FILENO, __progname, strlen(__progname)); - write(STDERR_FILENO, malloc_func, strlen(malloc_func)); - write(STDERR_FILENO, q, strlen(q)); - write(STDERR_FILENO, p, strlen(p)); + _libc_write(STDERR_FILENO, __progname, strlen(__progname)); + _libc_write(STDERR_FILENO, malloc_func, strlen(malloc_func)); + _libc_write(STDERR_FILENO, q, strlen(q)); + _libc_write(STDERR_FILENO, p, strlen(p)); } - /* * Allocate a number of pages from the OS */ |
