- (dtucker) [session.c] Bug #927: make .hushlogin silent again. ok djm@

[openssh.git] / atomicio.c

diff --git a/atomicio.c b/atomicio.c
index 7985fb80d37b3db123de47a5da00a935f6434bd5..7637e167198685f1d421764265f0e8868a01f1a0 100644 (file)
--- a/atomicio.c
+++ b/atomicio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995,1999 Theo de Raadt
+ * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,17 +24,16 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: atomicio.c,v 1.8 2001/01/21 19:05:40 markus Exp $");
+RCSID("$OpenBSD: atomicio.c,v 1.12 2003/07/31 15:50:16 avsm Exp $");
 
-#include "xmalloc.h"
 #include "atomicio.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(f, fd, _s, n)
-       ssize_t (*f) ();
+       ssize_t (*f) (int, void *, size_t);
        int fd;
        void *_s;
        size_t n;