- andreas@cvs.openbsd.org 2009/06/12 20:43:22

     [monitor.c packet.c]
     Fix warnings found by chl@ and djm@ and change roaming_atomicio's
     return type to match atomicio's
     Diff from djm@, ok markus@

diff --git a/ChangeLog b/ChangeLog
index 8ed7db993dbe305d65fe8142386779e2ec60e9ef..7df6881d720f98ce9948ef090c455072c94f1b82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,11 @@
      changes. Most code from Martin Forssen, maf at appgate dot com.
      ok markus@
      Also, applied appropriate changes to Makefile.in
+   - andreas@cvs.openbsd.org 2009/06/12 20:43:22
+     [monitor.c packet.c]
+     Fix warnings found by chl@ and djm@ and change roaming_atomicio's
+     return type to match atomicio's
+     Diff from djm@, ok markus@
 
 20090616
  - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t

diff --git a/monitor.c b/monitor.c
index 36a9e1dc16bac20b9a4496610b6916088b734f23..ace25c4047b0f1dc5e6a969ee927eca596c8e7cb 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.103 2009/05/28 16:50:16 andreas Exp $ */
+/* $OpenBSD: monitor.c,v 1.104 2009/06/12 20:43:22 andreas Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -88,6 +88,7 @@
 #include "compat.h"
 #include "ssh2.h"
 #include "jpake.h"
+#include "roaming.h"
 
 #ifdef GSSAPI
 static Gssctxt *gsscontext = NULL;

diff --git a/packet.c b/packet.c
index f3f8389a3c3c2ef40e3236e8a4a0d9b7ca17ad88..f74fe52e3f6816bb63bec76c27947842b0642b0c 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.163 2009/05/28 16:50:16 andreas Exp $ */
+/* $OpenBSD: packet.c,v 1.164 2009/06/12 20:43:22 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -188,7 +188,7 @@ struct session_state {
 static struct session_state *active_state;
 
 static struct session_state *
-alloc_session_state()
+alloc_session_state(void)
 {
     struct session_state *s = xcalloc(1, sizeof(*s));