[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5333] Fix whitespace damage in compatfd
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [5333] Fix whitespace damage in compatfd |
Date: |
Sat, 27 Sep 2008 20:41:11 +0000 |
Revision: 5333
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5333
Author: aliguori
Date: 2008-09-27 20:41:11 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
Fix whitespace damage in compatfd
Spotted by malc.
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/compatfd.c
Modified: trunk/compatfd.c
===================================================================
--- trunk/compatfd.c 2008-09-27 19:43:18 UTC (rev 5332)
+++ trunk/compatfd.c 2008-09-27 20:41:11 UTC (rev 5333)
@@ -33,35 +33,35 @@
sigprocmask(SIG_BLOCK, &all, NULL);
do {
- siginfo_t siginfo;
+ siginfo_t siginfo;
- err = sigwaitinfo(&info->mask, &siginfo);
- if (err == -1 && errno == EINTR) {
+ err = sigwaitinfo(&info->mask, &siginfo);
+ if (err == -1 && errno == EINTR) {
err = 0;
continue;
}
- if (err > 0) {
- char buffer[128];
- size_t offset = 0;
+ if (err > 0) {
+ char buffer[128];
+ size_t offset = 0;
- memcpy(buffer, &err, sizeof(err));
- while (offset < sizeof(buffer)) {
- ssize_t len;
+ memcpy(buffer, &err, sizeof(err));
+ while (offset < sizeof(buffer)) {
+ ssize_t len;
- len = write(info->fd, buffer + offset,
- sizeof(buffer) - offset);
- if (len == -1 && errno == EINTR)
- continue;
+ len = write(info->fd, buffer + offset,
+ sizeof(buffer) - offset);
+ if (len == -1 && errno == EINTR)
+ continue;
- if (len <= 0) {
- err = -1;
- break;
- }
+ if (len <= 0) {
+ err = -1;
+ break;
+ }
- offset += len;
- }
- }
+ offset += len;
+ }
+ }
} while (err >= 0);
return NULL;
@@ -76,13 +76,13 @@
info = malloc(sizeof(*info));
if (info == NULL) {
- errno = ENOMEM;
- return -1;
+ errno = ENOMEM;
+ return -1;
}
if (pipe(fds) == -1) {
- free(info);
- return -1;
+ free(info);
+ return -1;
}
memcpy(&info->mask, mask, sizeof(*mask));
@@ -105,7 +105,7 @@
ret = syscall(SYS_signalfd, -1, mask, _NSIG / 8);
if (!(ret == -1 && errno == ENOSYS))
- return ret;
+ return ret;
#endif
return qemu_signalfd_compat(mask);
@@ -118,10 +118,10 @@
ret = syscall(SYS_eventfd, 0);
if (ret >= 0) {
- fds[0] = fds[1] = ret;
- return 0;
+ fds[0] = fds[1] = ret;
+ return 0;
} else if (!(ret == -1 && errno == ENOSYS))
- return ret;
+ return ret;
#endif
return pipe(fds);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5333] Fix whitespace damage in compatfd,
Anthony Liguori <=