diff options
Diffstat (limited to 'src/lib/libc/stdlib')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 85a95652e0..cde2c9d97a 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #if defined(LIBC_SCCS) && !defined(lint) | 10 | #if defined(LIBC_SCCS) && !defined(lint) |
| 11 | static char rcsid[] = "$OpenBSD: malloc.c,v 1.59 2003/08/04 16:51:49 jfb Exp $"; | 11 | static char rcsid[] = "$OpenBSD: malloc.c,v 1.60 2003/09/27 21:09:15 tedu Exp $"; |
| 12 | #endif /* LIBC_SCCS and not lint */ | 12 | #endif /* LIBC_SCCS and not lint */ |
| 13 | 13 | ||
| 14 | /* | 14 | /* |
| @@ -149,7 +149,7 @@ static int fdzero; | |||
| 149 | #define MMAP_FD fdzero | 149 | #define MMAP_FD fdzero |
| 150 | #define INIT_MMAP() \ | 150 | #define INIT_MMAP() \ |
| 151 | { if ((fdzero=open("/dev/zero", O_RDWR, 0000)) == -1) \ | 151 | { if ((fdzero=open("/dev/zero", O_RDWR, 0000)) == -1) \ |
| 152 | wrterror("open of /dev/zero"); } | 152 | wrterror("open of /dev/zero.\n"); } |
| 153 | #else | 153 | #else |
| 154 | #define MMAP_FD (-1) | 154 | #define MMAP_FD (-1) |
| 155 | #define INIT_MMAP() | 155 | #define INIT_MMAP() |
| @@ -381,7 +381,7 @@ map_pages(size_t pages) | |||
| 381 | pages <<= malloc_pageshift; | 381 | pages <<= malloc_pageshift; |
| 382 | if (pages > SIZE_T_MAX - (size_t)result) { | 382 | if (pages > SIZE_T_MAX - (size_t)result) { |
| 383 | #ifdef MALLOC_EXTRA_SANITY | 383 | #ifdef MALLOC_EXTRA_SANITY |
| 384 | wrtwarning("(ES): overflow in map_pages fails\n"); | 384 | wrtwarning("(ES): overflow in map_pages fails.\n"); |
| 385 | #endif /* MALLOC_EXTRA_SANITY */ | 385 | #endif /* MALLOC_EXTRA_SANITY */ |
| 386 | errno = ENOMEM; | 386 | errno = ENOMEM; |
| 387 | return (NULL); | 387 | return (NULL); |
| @@ -390,7 +390,7 @@ map_pages(size_t pages) | |||
| 390 | 390 | ||
| 391 | if (brk(tail) == (char *)-1) { | 391 | if (brk(tail) == (char *)-1) { |
| 392 | #ifdef MALLOC_EXTRA_SANITY | 392 | #ifdef MALLOC_EXTRA_SANITY |
| 393 | wrtwarning("(ES): map_pages fails\n"); | 393 | wrtwarning("(ES): map_pages fails.\n"); |
| 394 | #endif /* MALLOC_EXTRA_SANITY */ | 394 | #endif /* MALLOC_EXTRA_SANITY */ |
| 395 | return (NULL); | 395 | return (NULL); |
| 396 | } | 396 | } |
| @@ -521,7 +521,7 @@ malloc_init(void) | |||
| 521 | default: | 521 | default: |
| 522 | j = malloc_abort; | 522 | j = malloc_abort; |
| 523 | malloc_abort = 0; | 523 | malloc_abort = 0; |
| 524 | wrtwarning("unknown char in MALLOC_OPTIONS\n"); | 524 | wrtwarning("unknown char in MALLOC_OPTIONS.\n"); |
| 525 | malloc_abort = j; | 525 | malloc_abort = j; |
| 526 | break; | 526 | break; |
| 527 | } | 527 | } |
| @@ -594,19 +594,19 @@ malloc_pages(size_t size) | |||
| 594 | 594 | ||
| 595 | #ifdef MALLOC_EXTRA_SANITY | 595 | #ifdef MALLOC_EXTRA_SANITY |
| 596 | if (pf->size & malloc_pagemask) | 596 | if (pf->size & malloc_pagemask) |
| 597 | wrterror("(ES): junk length entry on free_list\n"); | 597 | wrterror("(ES): junk length entry on free_list.\n"); |
| 598 | if (!pf->size) | 598 | if (!pf->size) |
| 599 | wrterror("(ES): zero length entry on free_list\n"); | 599 | wrterror("(ES): zero length entry on free_list.\n"); |
| 600 | if (pf->page == pf->end) | 600 | if (pf->page == pf->end) |
| 601 | wrterror("(ES): zero entry on free_list\n"); | 601 | wrterror("(ES): zero entry on free_list.\n"); |
| 602 | if (pf->page > pf->end) | 602 | if (pf->page > pf->end) |
| 603 | wrterror("(ES): sick entry on free_list\n"); | 603 | wrterror("(ES): sick entry on free_list.\n"); |
| 604 | if ((void*)pf->page >= (void*)sbrk(0)) | 604 | if ((void*)pf->page >= (void*)sbrk(0)) |
| 605 | wrterror("(ES): entry on free_list past brk\n"); | 605 | wrterror("(ES): entry on free_list past brk.\n"); |
| 606 | if (page_dir[ptr2index(pf->page)] != MALLOC_FREE) | 606 | if (page_dir[ptr2index(pf->page)] != MALLOC_FREE) |
| 607 | wrterror("(ES): non-free first page on free-list\n"); | 607 | wrterror("(ES): non-free first page on free-list.\n"); |
| 608 | if (page_dir[ptr2index(pf->end)-1] != MALLOC_FREE) | 608 | if (page_dir[ptr2index(pf->end)-1] != MALLOC_FREE) |
| 609 | wrterror("(ES): non-free last page on free-list\n"); | 609 | wrterror("(ES): non-free last page on free-list.\n"); |
| 610 | #endif /* MALLOC_EXTRA_SANITY */ | 610 | #endif /* MALLOC_EXTRA_SANITY */ |
| 611 | 611 | ||
| 612 | if (pf->size < size) | 612 | if (pf->size < size) |
| @@ -629,7 +629,7 @@ malloc_pages(size_t size) | |||
| 629 | 629 | ||
| 630 | #ifdef MALLOC_EXTRA_SANITY | 630 | #ifdef MALLOC_EXTRA_SANITY |
| 631 | if (p != NULL && page_dir[ptr2index(p)] != MALLOC_FREE) | 631 | if (p != NULL && page_dir[ptr2index(p)] != MALLOC_FREE) |
| 632 | wrterror("(ES): allocated non-free page on free-list\n"); | 632 | wrterror("(ES): allocated non-free page on free-list.\n"); |
| 633 | #endif /* MALLOC_EXTRA_SANITY */ | 633 | #endif /* MALLOC_EXTRA_SANITY */ |
| 634 | 634 | ||
| 635 | size >>= malloc_pageshift; | 635 | size >>= malloc_pageshift; |
| @@ -1140,7 +1140,7 @@ free_bytes(void *ptr, int index, struct pginfo *info) | |||
| 1140 | mp = &((*mp)->next); | 1140 | mp = &((*mp)->next); |
| 1141 | #ifdef MALLOC_EXTRA_SANITY | 1141 | #ifdef MALLOC_EXTRA_SANITY |
| 1142 | if (!*mp) | 1142 | if (!*mp) |
| 1143 | wrterror("(ES): Not on queue\n"); | 1143 | wrterror("(ES): Not on queue.\n"); |
| 1144 | #endif /* MALLOC_EXTRA_SANITY */ | 1144 | #endif /* MALLOC_EXTRA_SANITY */ |
| 1145 | } | 1145 | } |
| 1146 | *mp = info->next; | 1146 | *mp = info->next; |
| @@ -1209,7 +1209,7 @@ static int malloc_active; | |||
| 1209 | void * | 1209 | void * |
| 1210 | malloc(size_t size) | 1210 | malloc(size_t size) |
| 1211 | { | 1211 | { |
| 1212 | register void *r; | 1212 | void *r; |
| 1213 | 1213 | ||
| 1214 | malloc_func = " in malloc():"; | 1214 | malloc_func = " in malloc():"; |
| 1215 | _MALLOC_LOCK(); | 1215 | _MALLOC_LOCK(); |
| @@ -1249,7 +1249,7 @@ free(void *ptr) | |||
| 1249 | void * | 1249 | void * |
| 1250 | realloc(void *ptr, size_t size) | 1250 | realloc(void *ptr, size_t size) |
| 1251 | { | 1251 | { |
| 1252 | register void *r; | 1252 | void *r; |
| 1253 | 1253 | ||
| 1254 | malloc_func = " in realloc():"; | 1254 | malloc_func = " in realloc():"; |
| 1255 | _MALLOC_LOCK(); | 1255 | _MALLOC_LOCK(); |
