From: Petr Uzel <petr.uzel@suse.cz>
Date: Fri, 4 Feb 2011 08:05:58 +0000 (+0100)
Subject: wipefs: use write_all from include/writeall.h
X-Git-Tag: v2.19~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0239ac01b060ae3246aca463861f79681d275dcc;p=thirdparty%2Futil-linux.git

wipefs: use write_all from include/writeall.h

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 4ab361597f..079a9bccfa 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -36,6 +36,7 @@
 #include "nls.h"
 #include "xalloc.h"
 #include "strutils.h"
+#include "writeall.h"
 
 struct wipe_desc {
 	loff_t		offset;		/* magic string offset */
@@ -212,24 +213,6 @@ read_offsets(struct wipe_desc *wp, const char *fname, int zap)
 	return wp;
 }
 
-static int
-write_all(int fd, const void *buf, size_t count)
-{
-	while(count) {
-		ssize_t tmp;
-
-		errno = 0;
-		tmp = write(fd, buf, count);
-		if (tmp > 0) {
-			count -= tmp;
-			if (count)
-				buf += tmp;
-		} else if (errno != EINTR && errno != EAGAIN)
-			return -1;
-	}
-	return 0;
-}
-
 static int
 do_wipe_offset(int fd, struct wipe_desc *wp, const char *fname, int noact)
 {