gwj / at91sam9263 · Commits

Commit b8ae75538e8a9db54207e6bf3da484939bb5df7e

Authored by aliguori
1 parent cc6747f4

Fix whitespace damage in compatfd 

Spotted by malc.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5333 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 28 additions and 28 deletions
compatfd.c
  View file @b8ae755
@@ -33,35 +33,35 @@ static void *sigwait_compat(void *opaque) @@ -33,35 +33,35 @@ static void *sigwait_compat(void *opaque)
33 sigprocmask(SIG_BLOCK, &all, NULL); 33 sigprocmask(SIG_BLOCK, &all, NULL);
34 34
35 do { 35 do {
36 - siginfo_t siginfo; 36 + siginfo_t siginfo;
37 37
38 - err = sigwaitinfo(&info->mask, &siginfo);  
39 - if (err == -1 && errno == EINTR) { 38 + err = sigwaitinfo(&info->mask, &siginfo);
  39 + if (err == -1 && errno == EINTR) {
40 err = 0; 40 err = 0;
41 continue; 41 continue;
42 } 42 }
43 43
44 - if (err > 0) {  
45 - char buffer[128];  
46 - size_t offset = 0; 44 + if (err > 0) {
  45 + char buffer[128];
  46 + size_t offset = 0;
47 47
48 - memcpy(buffer, &err, sizeof(err));  
49 - while (offset < sizeof(buffer)) {  
50 - ssize_t len; 48 + memcpy(buffer, &err, sizeof(err));
  49 + while (offset < sizeof(buffer)) {
  50 + ssize_t len;
51 51
52 - len = write(info->fd, buffer + offset,  
53 - sizeof(buffer) - offset);  
54 - if (len == -1 && errno == EINTR)  
55 - continue; 52 + len = write(info->fd, buffer + offset,
  53 + sizeof(buffer) - offset);
  54 + if (len == -1 && errno == EINTR)
  55 + continue;
56 56
57 - if (len <= 0) {  
58 - err = -1;  
59 - break;  
60 - } 57 + if (len <= 0) {
  58 + err = -1;
  59 + break;
  60 + }
61 61
62 - offset += len;  
63 - }  
64 - } 62 + offset += len;
  63 + }
  64 + }
65 } while (err >= 0); 65 } while (err >= 0);
66 66
67 return NULL; 67 return NULL;
@@ -76,13 +76,13 @@ static int qemu_signalfd_compat(const sigset_t *mask) @@ -76,13 +76,13 @@ static int qemu_signalfd_compat(const sigset_t *mask)
76 76
77 info = malloc(sizeof(*info)); 77 info = malloc(sizeof(*info));
78 if (info == NULL) { 78 if (info == NULL) {
79 - errno = ENOMEM;  
80 - return -1; 79 + errno = ENOMEM;
  80 + return -1;
81 } 81 }
82 82
83 if (pipe(fds) == -1) { 83 if (pipe(fds) == -1) {
84 - free(info);  
85 - return -1; 84 + free(info);
  85 + return -1;
86 } 86 }
87 87
88 memcpy(&info->mask, mask, sizeof(*mask)); 88 memcpy(&info->mask, mask, sizeof(*mask));
@@ -105,7 +105,7 @@ int qemu_signalfd(const sigset_t *mask) @@ -105,7 +105,7 @@ int qemu_signalfd(const sigset_t *mask)
105 105
106 ret = syscall(SYS_signalfd, -1, mask, _NSIG / 8); 106 ret = syscall(SYS_signalfd, -1, mask, _NSIG / 8);
107 if (!(ret == -1 && errno == ENOSYS)) 107 if (!(ret == -1 && errno == ENOSYS))
108 - return ret; 108 + return ret;
109 #endif 109 #endif
110 110
111 return qemu_signalfd_compat(mask); 111 return qemu_signalfd_compat(mask);
@@ -118,10 +118,10 @@ int qemu_eventfd(int *fds) @@ -118,10 +118,10 @@ int qemu_eventfd(int *fds)
118 118
119 ret = syscall(SYS_eventfd, 0); 119 ret = syscall(SYS_eventfd, 0);
120 if (ret >= 0) { 120 if (ret >= 0) {
121 - fds[0] = fds[1] = ret;  
122 - return 0; 121 + fds[0] = fds[1] = ret;
  122 + return 0;
123 } else if (!(ret == -1 && errno == ENOSYS)) 123 } else if (!(ret == -1 && errno == ENOSYS))
124 - return ret; 124 + return ret;
125 #endif 125 #endif
126 126
127 return pipe(fds); 127 return pipe(fds);