- djm@cvs.openbsd.org 2013/07/12 00:19:59

     [auth-options.c auth-rsa.c bufaux.c buffer.h channels.c hostfile.c]
     [hostfile.h mux.c packet.c packet.h roaming_common.c serverloop.c]
     fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

1 files changed, 6 insertions, 5 deletions

diff --git a/packet.c b/packet.c
index b25395d4b..0d27e7592 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.187 2013/06/01 13:15:52 dtucker Exp $ */
+/* $OpenBSD: packet.c,v 1.188 2013/07/12 00:19:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1048,7 +1048,7 @@ packet_send(void)
 int
 packet_read_seqnr(u_int32_t *seqnr_p)
 {
-        int type, len, ret, ms_remain, cont;
+        int type, len, ret, cont, ms_remain = 0;
         fd_set *setp;
         char buf[8192];
         struct timeval timeout, start, *timeoutp = NULL;
@@ -1487,6 +1487,8 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
                 } else {
                         type = packet_read_poll1();
                         switch (type) {
+                        case SSH_MSG_NONE:
+                                return SSH_MSG_NONE;
                         case SSH_MSG_IGNORE:
                                 break;
                         case SSH_MSG_DEBUG:
@@ -1501,8 +1503,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
                                 cleanup_exit(255);
                                 break;
                         default:
-                                if (type)
-                                        DBG(debug("received packet type %d", type));
+                                DBG(debug("received packet type %d", type));
                                 return type;
                         }
                 }
@@ -1739,7 +1740,7 @@ void
 packet_write_wait(void)
 {
         fd_set *setp;
-        int ret, ms_remain;
+        int ret, ms_remain = 0;
         struct timeval start, timeout, *timeoutp = NULL;
 
         setp = (fd_set *)xcalloc(howmany(active_state->connection_out + 1,