diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 18:58:46 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-06-21 18:58:46 +1000 |
commit | b422afa41f75229da03a90a52b0f30206b5797a1 (patch) | |
tree | 313a767cedbd5a2d8e7f060a924ee5f7db8895a1 | |
parent | c5564e1c4c41ae9af96973e2996e2a4285acbae8 (diff) |
- 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@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor.c | 3 | ||||
-rw-r--r-- | packet.c | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -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 @@ -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; @@ -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)); |