From 159bf5aefc1c36be2d4918507458197f2085b208 Mon Sep 17 00:00:00 2001 From: Thorsten Lockert Date: Wed, 30 Apr 1997 05:52:51 +0000 Subject: Be more careful with mixing types --- lib/libc/stdlib/malloc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index fc82a4f4190..ae88e068ff5 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -8,7 +8,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: malloc.c,v 1.23 1997/04/05 05:05:44 tholo Exp $"; +static char rcsid[] = "$OpenBSD: malloc.c,v 1.24 1997/04/30 05:52:50 tholo Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -160,7 +160,7 @@ static u_long last_index; static struct pginfo **page_dir; /* How many slots in the page directory */ -static unsigned malloc_ninfo; +static size_t malloc_ninfo; /* Free pages line up here */ static struct pgfree free_list; @@ -275,7 +275,7 @@ malloc_dump(fd) /* print out various info */ fprintf(fd, "Minsize\t%d\n", malloc_minsize); fprintf(fd, "Maxsize\t%d\n", malloc_maxsize); - fprintf(fd, "Pagesize\t%d\n", malloc_pagesize); + fprintf(fd, "Pagesize\t%lu\n", (u_long)malloc_pagesize); fprintf(fd, "Pageshift\t%d\n", malloc_pageshift); fprintf(fd, "FirstPage\t%ld\n", malloc_origo); fprintf(fd, "LastPage\t%ld %lx\n", last_index+malloc_pageshift, @@ -367,8 +367,7 @@ extend_pgdir(index) u_long index; { struct pginfo **new, **old; - int i; - size_t oldlen; + size_t i, oldlen; /* Make it this many pages */ i = index * sizeof *page_dir; @@ -622,7 +621,7 @@ malloc_make_chunks(bits) int i, k, l; /* Allocate a new bucket */ - pp = malloc_pages(malloc_pagesize); + pp = malloc_pages((size_t)malloc_pagesize); if (!pp) return 0; -- cgit v1.2.3