- itojun@cvs.openbsd.org 2002/06/24 15:49:22

     [msg.c]
     printf type pedant

2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ec65ef8df..97c0442e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
    - markus@cvs.openbsd.org 2002/06/24 14:55:38
      [authfile.c kex.c ssh-agent.c]
      cat to (void) when output from buffer_get_X is ignored
+   - itojun@cvs.openbsd.org 2002/06/24 15:49:22
+     [msg.c]
+     printf type pedant
 
 20020625
  - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
@@ -1112,4 +1115,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2277 2002/06/25 23:19:13 mouring Exp $
+$Id: ChangeLog,v 1.2278 2002/06/25 23:20:18 mouring Exp $
diff --git a/msg.c b/msg.c
index 103aed2cd..7275c847d 100644
--- a/msg.c
+++ b/msg.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: msg.c,v 1.2 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: msg.c,v 1.3 2002/06/24 15:49:22 itojun Exp $");
 
 #include "buffer.h"
 #include "getput.h"
@@ -36,7 +36,7 @@ msg_send(int fd, u_char type, Buffer *m)
         u_char buf[5];
         u_int mlen = buffer_len(m);
 
-        debug3("msg_send: type %d", type);
+        debug3("msg_send: type %u", (unsigned int)type & 0xff);
 
         PUT_32BIT(buf, mlen + 1);
         buf[4] = type;          /* 1st byte of payload is mesg-type */
@@ -59,7 +59,7 @@ msg_recv(int fd, Buffer *m)
         if (res != sizeof(buf)) {
                 if (res == 0)
                         return -1;
-                fatal("msg_recv: read: header %d", res);
+                fatal("msg_recv: read: header %ld", (long)res);
         }
         msg_len = GET_32BIT(buf);
         if (msg_len > 256 * 1024)