External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

commandhelper: Remove numpollfds variable

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-02-01 12:27:46 +01:00 committed by Peter Krempa
parent 2a1dc938f1
commit 9f9b133e0c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/commandhelper.c
View File

@ -67,7 +67,6 @@ int main(int argc, char **argv) {
int readfds[3] = { STDIN_FILENO, }; int readfds[3] = { STDIN_FILENO, };
int numreadfds = 1; int numreadfds = 1;
struct pollfd fds[3]; struct pollfd fds[3];
int numpollfds = 0;
char *buffers[3] = {NULL, NULL, NULL}; char *buffers[3] = {NULL, NULL, NULL};
size_t buflen[3] = {0, 0, 0}; size_t buflen[3] = {0, 0, 0};
char c; char c;
@ -167,21 +166,20 @@ int main(int argc, char **argv) {
fflush(stderr); fflush(stderr);
for (i = 0; i < numreadfds; i++) { for (i = 0; i < numreadfds; i++) {
fds[numpollfds].fd = readfds[i]; fds[i].fd = readfds[i];
fds[numpollfds].events = POLLIN; fds[i].events = POLLIN;
fds[numpollfds].revents = 0; fds[i].revents = 0;
numpollfds++;
} }
for (;;) { for (;;) {
unsigned ctr = 0; unsigned ctr = 0;
if (poll(fds, numpollfds, -1) < 0) { if (poll(fds, numreadfds, -1) < 0) {
printf("poll failed: %s\n", strerror(errno)); printf("poll failed: %s\n", strerror(errno));
goto cleanup; goto cleanup;
} }
for (i = 0; i < numpollfds; i++) { for (i = 0; i < numreadfds; i++) {
short revents = POLLIN | POLLHUP | POLLERR; short revents = POLLIN | POLLHUP | POLLERR;
# ifdef __APPLE__ # ifdef __APPLE__
@ -212,7 +210,7 @@ int main(int argc, char **argv) {
} }
} }
} }
for (i = 0; i < numpollfds; i++) { for (i = 0; i < numreadfds; i++) {
if (fds[i].events) { if (fds[i].events) {
ctr++; ctr++;
break; break;
@ -222,7 +220,7 @@ int main(int argc, char **argv) {
break; break;
} }
for (i = 0; i < numpollfds; i++) { for (i = 0; i < numreadfds; i++) {
if (fwrite(buffers[i], 1, buflen[i], stdout) != buflen[i]) if (fwrite(buffers[i], 1, buflen[i], stdout) != buflen[i])
goto cleanup; goto cleanup;
if (fwrite(buffers[i], 1, buflen[i], stderr) != buflen[i]) if (fwrite(buffers[i], 1, buflen[i], stderr) != buflen[i])