diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | monitor_mm.c | 20 | ||||
-rw-r--r-- | monitor_wrap.c | 6 |
3 files changed, 19 insertions, 14 deletions
@@ -31,6 +31,11 @@ | |||
31 | - markus@cvs.openbsd.org 2002/03/25 17:34:27 | 31 | - markus@cvs.openbsd.org 2002/03/25 17:34:27 |
32 | [scard.c scard.h ssh-agent.c ssh-keygen.c ssh.c] | 32 | [scard.c scard.h ssh-agent.c ssh-keygen.c ssh.c] |
33 | change sc_get_key to sc_get_keys and hide smartcard details in scard.c | 33 | change sc_get_key to sc_get_keys and hide smartcard details in scard.c |
34 | - stevesk@cvs.openbsd.org 2002/03/25 20:12:10 | ||
35 | [monitor_mm.c monitor_wrap.c] | ||
36 | ssize_t args use "%ld" and cast to (long) | ||
37 | size_t args use "%lu" and cast to (u_long) | ||
38 | ok markus@ and thanks millert@ | ||
34 | 39 | ||
35 | 20020324 | 40 | 20020324 |
36 | - (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure | 41 | - (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure |
@@ -8045,4 +8050,4 @@ | |||
8045 | - Wrote replacements for strlcpy and mkdtemp | 8050 | - Wrote replacements for strlcpy and mkdtemp |
8046 | - Released 1.0pre1 | 8051 | - Released 1.0pre1 |
8047 | 8052 | ||
8048 | $Id: ChangeLog,v 1.1987 2002/03/26 03:17:42 mouring Exp $ | 8053 | $Id: ChangeLog,v 1.1988 2002/03/26 03:20:45 mouring Exp $ |
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" |
27 | RCSID("$OpenBSD: monitor_mm.c,v 1.3 2002/03/19 10:41:32 markus Exp $"); | 27 | RCSID("$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 | ||
diff --git a/monitor_wrap.c b/monitor_wrap.c index 8b0ded190..53bf59b5b 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.4 2002/03/19 14:27:39 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.5 2002/03/25 20:12:10 stevesk Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -88,7 +88,7 @@ mm_request_receive(int socket, Buffer *m) | |||
88 | if (res != sizeof(buf)) { | 88 | if (res != sizeof(buf)) { |
89 | if (res == 0) | 89 | if (res == 0) |
90 | fatal_cleanup(); | 90 | fatal_cleanup(); |
91 | fatal("%s: read: %d", __FUNCTION__, res); | 91 | fatal("%s: read: %ld", __FUNCTION__, (long)res); |
92 | } | 92 | } |
93 | msg_len = GET_32BIT(buf); | 93 | msg_len = GET_32BIT(buf); |
94 | if (msg_len > 256 * 1024) | 94 | if (msg_len > 256 * 1024) |
@@ -97,7 +97,7 @@ mm_request_receive(int socket, Buffer *m) | |||
97 | buffer_append_space(m, msg_len); | 97 | buffer_append_space(m, msg_len); |
98 | res = atomicio(read, socket, buffer_ptr(m), msg_len); | 98 | res = atomicio(read, socket, buffer_ptr(m), msg_len); |
99 | if (res != msg_len) | 99 | if (res != msg_len) |
100 | fatal("%s: read: %d != msg_len", __FUNCTION__, res); | 100 | fatal("%s: read: %ld != msg_len", __FUNCTION__, (long)res); |
101 | } | 101 | } |
102 | 102 | ||
103 | void | 103 | void |