summaryrefslogtreecommitdiff
path: root/monitor_mm.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor_mm.c')
-rw-r--r--monitor_mm.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/monitor_mm.c b/monitor_mm.c
index bce98c93c..b383193cd 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -24,7 +24,7 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: monitor_mm.c,v 1.3 2002/03/19 10:41:32 markus Exp $"); 27RCSID("$OpenBSD: monitor_mm.c,v 1.4 2002/03/25 20:12:10 stevesk Exp $");
28 28
29#include <sys/mman.h> 29#include <sys/mman.h>
30 30
@@ -56,8 +56,8 @@ mm_make_entry(struct mm_master *mm, struct mmtree *head,
56 56
57 tmp2 = RB_INSERT(mmtree, head, tmp); 57 tmp2 = RB_INSERT(mmtree, head, tmp);
58 if (tmp2 != NULL) 58 if (tmp2 != NULL)
59 fatal("mm_make_entry(%p): double address %p->%p(%d)", 59 fatal("mm_make_entry(%p): double address %p->%p(%lu)",
60 mm, tmp2, address, size); 60 mm, tmp2, address, (u_long)size);
61 61
62 return (tmp); 62 return (tmp);
63} 63}
@@ -85,7 +85,7 @@ mm_create(struct mm_master *mmalloc, size_t size)
85 address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, 85 address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
86 -1, 0); 86 -1, 0);
87 if (address == MAP_FAILED) 87 if (address == MAP_FAILED)
88 fatal("mmap(%d)", size); 88 fatal("mmap(%lu)", (u_long)size);
89 89
90 mm->address = address; 90 mm->address = address;
91 mm->size = size; 91 mm->size = size;
@@ -124,7 +124,7 @@ mm_destroy(struct mm_master *mm)
124 mm_freelist(mm->mmalloc, &mm->rb_allocated); 124 mm_freelist(mm->mmalloc, &mm->rb_allocated);
125 125
126 if (munmap(mm->address, mm->size) == -1) 126 if (munmap(mm->address, mm->size) == -1)
127 fatal("munmap(%p, %d)", mm->address, mm->size); 127 fatal("munmap(%p, %lu)", mm->address, (u_long)mm->size);
128 if (mm->mmalloc == NULL) 128 if (mm->mmalloc == NULL)
129 xfree(mm); 129 xfree(mm);
130 else 130 else
@@ -138,7 +138,7 @@ mm_xmalloc(struct mm_master *mm, size_t size)
138 138
139 address = mm_malloc(mm, size); 139 address = mm_malloc(mm, size);
140 if (address == NULL) 140 if (address == NULL)
141 fatal("%s: mm_malloc(%d)", __FUNCTION__, size); 141 fatal("%s: mm_malloc(%lu)", __FUNCTION__, (u_long)size);
142 return (address); 142 return (address);
143} 143}
144 144
@@ -223,8 +223,8 @@ mm_free(struct mm_master *mm, void *address)
223 223
224 /* Check if range does not overlap */ 224 /* Check if range does not overlap */
225 if (prev != NULL && MM_ADDRESS_END(prev) > address) 225 if (prev != NULL && MM_ADDRESS_END(prev) > address)
226 fatal("mm_free: memory corruption: %p(%d) > %p", 226 fatal("mm_free: memory corruption: %p(%lu) > %p",
227 prev->address, prev->size, address); 227 prev->address, (u_long)prev->size, address);
228 228
229 /* See if we can merge backwards */ 229 /* See if we can merge backwards */
230 if (prev != NULL && MM_ADDRESS_END(prev) == address) { 230 if (prev != NULL && MM_ADDRESS_END(prev) == address) {
@@ -246,8 +246,8 @@ mm_free(struct mm_master *mm, void *address)
246 return; 246 return;
247 247
248 if (MM_ADDRESS_END(prev) > mms->address) 248 if (MM_ADDRESS_END(prev) > mms->address)
249 fatal("mm_free: memory corruption: %p < %p(%d)", 249 fatal("mm_free: memory corruption: %p < %p(%lu)",
250 mms->address, prev->address, prev->size); 250 mms->address, prev->address, (u_long)prev->size);
251 if (MM_ADDRESS_END(prev) != mms->address) 251 if (MM_ADDRESS_END(prev) != mms->address)
252 return; 252 return;
253 253