From ecb4a6173df40a887fee2e8198e5c8985e2ca5e5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 25 Mar 2016 12:05:17 +0100 Subject: upgrade atomicio in order to remove K&R code in atomicio.c now, vwrite comes from atomicio.h --- atomicio.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'atomicio.h') diff --git a/atomicio.h b/atomicio.h index 6c1f3ac..0bd019f 100644 --- a/atomicio.h +++ b/atomicio.h @@ -1,8 +1,7 @@ +/* $OpenBSD: atomicio.h,v 1.7 2006/03/25 22:22:42 djm Exp $ */ /* - * Copied from OpenSSH 3.6.1p2, required for loginrec.c - * - * $OpenBSD: atomicio.h,v 1.4 2001/06/26 06:32:46 itojun Exp $ + * Copied from OpenSSH/OpenBSD, required for loginrec.c * * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. * All rights reserved. @@ -28,9 +27,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.h" - /* - * Ensure all of data on socket comes through. f==read || f==write + * Ensure all of data on socket comes through. f==read || f==vwrite */ -ssize_t atomicio(ssize_t (*)(), int, void *, size_t); +size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); + +#define vwrite (ssize_t (*)(int, void *, size_t))write -- cgit v1.2.3