From b1bdc5a6adae8f5e4d4a4f67c5aba488b5993d5e Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 4 Jul 2002 00:09:26 +0000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2002/06/28 01:50:37 [monitor_wrap.c] use ssize_t --- ChangeLog | 5 ++++- monitor_wrap.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99e2bb58b..4b093dae7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,9 @@ the difference between two pointers is not an int. Just do the safest thing and store the result in a long and then return 0, -1, or 1 based on that result. + - deraadt@cvs.openbsd.org 2002/06/28 01:50:37 + [monitor_wrap.c] + use ssize_t 20020702 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & @@ -1229,4 +1232,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2320 2002/07/04 00:08:23 mouring Exp $ +$Id: ChangeLog,v 1.2321 2002/07/04 00:09:26 mouring Exp $ diff --git a/monitor_wrap.c b/monitor_wrap.c index 938a67d90..00f6c610e 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_wrap.c,v 1.12 2002/06/26 15:00:32 deraadt Exp $"); +RCSID("$OpenBSD: monitor_wrap.c,v 1.13 2002/06/28 01:50:37 deraadt Exp $"); #include #include @@ -62,8 +62,8 @@ extern Buffer input, output; void mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) { - u_char buf[5]; u_int mlen = buffer_len(m); + u_char buf[5]; debug3("%s entering: type %d", __func__, type); @@ -79,8 +79,8 @@ void mm_request_receive(int socket, Buffer *m) { u_char buf[4]; - ssize_t res; u_int msg_len; + ssize_t res; debug3("%s entering", __func__);