From adb5cc1b4c1a477a1eace315e53e8bb75514350c Mon Sep 17 00:00:00 2001 From: dtucker Date: Sun, 21 Jun 2009 08:58:46 +0000 Subject: [PATCH] - 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@ --- ChangeLog | 5 +++++ monitor.c | 3 ++- packet.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ed7db99..7df6881d 100644 --- 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 36a9e1dc..ace25c40 100644 --- 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 * Copyright 2002 Markus Friedl @@ -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 f3f8389a..f74fe52e 100644 --- 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 * Copyright (c) 1995 Tatu Ylonen , 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)); -- 2.45.1