[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@
This commit is contained in:
Darren Tucker 2009-06-21 18:58:46 +10:00
parent c5564e1c4c
commit b422afa41f
3 changed files with 9 additions and 3 deletions

View File

@ -88,6 +88,11 @@
changes. Most code from Martin Forssen, maf at appgate dot com. changes. Most code from Martin Forssen, maf at appgate dot com.
ok markus@ ok markus@
Also, applied appropriate changes to Makefile.in 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 20090616
- (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t

View File

@ -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 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -88,6 +88,7 @@
#include "compat.h" #include "compat.h"
#include "ssh2.h" #include "ssh2.h"
#include "jpake.h" #include "jpake.h"
#include "roaming.h"
#ifdef GSSAPI #ifdef GSSAPI
static Gssctxt *gsscontext = NULL; static Gssctxt *gsscontext = NULL;

View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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 *active_state;
static struct session_state * static struct session_state *
alloc_session_state() alloc_session_state(void)
{ {
struct session_state *s = xcalloc(1, sizeof(*s)); struct session_state *s = xcalloc(1, sizeof(*s));