summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-02-07 18:04:51 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-02-07 18:04:51 +0000
commit275d2897dd80815f7acb4d5da686886aa97d4e3a (patch)
treefd740673e6b8f4948554c25a85618a201487db73 /usr.bin/ssh
parente6381dac98d1460c69e3a7ad54051f93d71fa4c5 (diff)
fix size_t -> int cast (use u_long). markus ok
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh-keyscan.c4
-rw-r--r--usr.bin/ssh/xmalloc.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c
index 96785af5040..35ab5ad102d 100644
--- a/usr.bin/ssh/ssh-keyscan.c
+++ b/usr.bin/ssh/ssh-keyscan.c
@@ -8,7 +8,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.12 2001/02/04 15:32:26 stevesk Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.13 2001/02/07 18:04:50 itojun Exp $");
#include <sys/queue.h>
#include <errno.h>
@@ -470,7 +470,7 @@ conloop(void)
seltime = c->c_tv;
seltime.tv_sec -= now.tv_sec;
seltime.tv_usec -= now.tv_usec;
- if ((int) seltime.tv_usec < 0) {
+ if (seltime.tv_usec < 0) {
seltime.tv_usec += 1000000;
seltime.tv_sec--;
}
diff --git a/usr.bin/ssh/xmalloc.c b/usr.bin/ssh/xmalloc.c
index a90f0d133d8..8a23b8b70ff 100644
--- a/usr.bin/ssh/xmalloc.c
+++ b/usr.bin/ssh/xmalloc.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.13 2001/02/07 16:46:08 markus Exp $");
+RCSID("$OpenBSD: xmalloc.c,v 1.14 2001/02/07 18:04:50 itojun Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -27,7 +27,7 @@ xmalloc(size_t size)
fatal("xmalloc: zero size");
ptr = malloc(size);
if (ptr == NULL)
- fatal("xmalloc: out of memory (allocating %d bytes)", (int) size);
+ fatal("xmalloc: out of memory (allocating %lu bytes)", (u_long) size);
return ptr;
}
@@ -42,7 +42,7 @@ xrealloc(void *ptr, size_t new_size)
fatal("xrealloc: NULL pointer given as argument");
new_ptr = realloc(ptr, new_size);
if (new_ptr == NULL)
- fatal("xrealloc: out of memory (new_size %d bytes)", (int) new_size);
+ fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
return new_ptr;
}