git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ruby: Run tests one at a time, instead of in parallel.
[libguestfs.git]
/
daemon
/
zero.c
diff --git
a/daemon/zero.c
b/daemon/zero.c
index
0ade242
..
4d06505
100644
(file)
--- a/
daemon/zero.c
+++ b/
daemon/zero.c
@@
-41,20
+41,17
@@
do_zero (const char *device)
memset (buf, 0, sizeof buf);
memset (buf, 0, sizeof buf);
- int err = 0;
- int saved_errno = 0;
for (i = 0; i < 32; ++i)
if (write (fd, buf, sizeof buf) != sizeof buf) {
for (i = 0; i < 32; ++i)
if (write (fd, buf, sizeof buf) != sizeof buf) {
- saved_errno = errno;
- err = -1;
+ reply_with_perror ("write: %s", device);
+ close (fd);
+ return -1;
}
}
- if (close (fd)
&& saved_errno == 0
) {
-
saved_errno = errno
;
-
err =
-1;
+ if (close (fd)
== -1
) {
+
reply_with_perror ("close: %s", device)
;
+
return
-1;
}
}
- if (saved_errno)
- errno = saved_errno;
- return err;
+ return 0;
}
}