diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 1998-09-04 19:03:57 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 1998-09-04 19:03:57 +0000 |
| commit | 13575fc46f0ff13172a820b6fcd3626f6de7263a (patch) | |
| tree | 04f25901a8758c17861c29f9c1bdfa732e92915b /libexec/rtld-elf/malloc.c | |
| parent | 26cdc317be4712a90683fd31ce92741741943c9c (diff) | |
Notes
Diffstat (limited to 'libexec/rtld-elf/malloc.c')
| -rw-r--r-- | libexec/rtld-elf/malloc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c index a4517003f15b..6689796b4888 100644 --- a/libexec/rtld-elf/malloc.c +++ b/libexec/rtld-elf/malloc.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: malloc.c,v 1.2 1996/01/19 18:36:54 jdp Exp $"; +static char *rcsid = "$Id: malloc.c,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -156,7 +156,8 @@ malloc(nbytes) size_t nbytes; { register union overhead *op; - register int bucket, n; + register int bucket; + register long n; register unsigned amt; /* @@ -168,7 +169,7 @@ malloc(nbytes) if (morepages(NPOOLPAGES) == 0) return NULL; op = (union overhead *)(pagepool_start); - n = n - sizeof (*op) - ((int)op & (n - 1)); + n = n - sizeof (*op) - ((long)op & (n - 1)); if (n < 0) n += pagesz; if (n) { @@ -462,12 +463,12 @@ int n; if (pagepool_end - pagepool_start > pagesz) { caddr_t addr = (caddr_t) - (((int)pagepool_start + pagesz - 1) & ~(pagesz - 1)); + (((long)pagepool_start + pagesz - 1) & ~(pagesz - 1)); if (munmap(addr, pagepool_end - addr) != 0) warn("morepages: munmap %p", addr); } - offset = (int)pagepool_start - ((int)pagepool_start & ~(pagesz - 1)); + offset = (long)pagepool_start - ((long)pagepool_start & ~(pagesz - 1)); if ((pagepool_start = mmap(0, n * pagesz, PROT_READ|PROT_WRITE, |
