61d6ae244
Ron Yorston
2015-04-20
Subject
libbb: remove unnecessary argument to nonblock_immune_read
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+1 -1
| @@ -713,7 +713,7 @@ void* xrealloc_vector_helper(void *vector, unsigned sizeof_and_shift, int idx) F | |
| extern ssize_t safe_read(int fd, void *buf, size_t count) FAST_FUNC; | |
| - | extern ssize_t nonblock_immune_read(int fd, void *buf, size_t count, int loop_on_EINTR) FAST_FUNC; |
| + | extern ssize_t nonblock_immune_read(int fd, void *buf, size_t count) FAST_FUNC; |
| // NB: will return short read on error, not -1, | |
| // if some data was read before error occurred | |
| extern ssize_t full_read(int fd, void *buf, size_t count) FAST_FUNC; | |
libbb/read_printf.c+4 -4
| @@ -45,20 +45,20 @@ | |
| * which detects EAGAIN and uses poll() to wait on the fd. | |
| * Thankfully, poll() doesn't care about O_NONBLOCK flag. | |
| */ | |
| - | ssize_t FAST_FUNC nonblock_immune_read(int fd, void *buf, size_t count, int loop_on_EINTR) |
| + | ssize_t FAST_FUNC nonblock_immune_read(int fd, void *buf, size_t count) |
| { | |
| struct pollfd pfd[1]; | |
| ssize_t n; | |
| while (1) { | |
| - | n = loop_on_EINTR ? safe_read(fd, buf, count) : read(fd, buf, count); |
| + | n = safe_read(fd, buf, count); |
| if (n >= 0 || errno != EAGAIN) | |
| return n; | |
| /* fd is in O_NONBLOCK mode. Wait using poll and repeat */ | |
| pfd[0].fd = fd; | |
| pfd[0].events = POLLIN; | |
| /* note: safe_poll pulls in printf */ | |
| - | loop_on_EINTR ? safe_poll(pfd, 1, -1) : poll(pfd, 1, -1); |
| + | safe_poll(pfd, 1, -1); |
| } | |
| } | |
| @@ -81,7 +81,7 @@ char* FAST_FUNC xmalloc_reads(int fd, size_t *maxsz_p) | |
| p = buf + sz; | |
| sz += 128; | |
| } | |
| - | if (nonblock_immune_read(fd, p, 1, /*loop_on_EINTR:*/ 1) != 1) { |
| + | if (nonblock_immune_read(fd, p, 1) != 1) { |
| /* EOF/error */ | |
| if (p == buf) { /* we read nothing */ | |
| free(buf); | |
shell/ash.c+3 -3
| @@ -5923,7 +5923,7 @@ expbackq(union node *cmd, int quoted, int quotes) | |
| read: | |
| if (in.fd < 0) | |
| break; | |
| - | i = nonblock_immune_read(in.fd, buf, sizeof(buf), /*loop_on_EINTR:*/ 1); |
| + | i = nonblock_immune_read(in.fd, buf, sizeof(buf)); |
| TRACE(("expbackq: read returns %d\n", i)); | |
| if (i <= 0) | |
| break; | |
| @@ -9696,7 +9696,7 @@ preadfd(void) | |
| #if ENABLE_FEATURE_EDITING | |
| retry: | |
| if (!iflag || g_parsefile->pf_fd != STDIN_FILENO) | |
| - | nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1, /*loop_on_EINTR:*/ 1); |
| + | nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1); |
| else { | |
| int timeout = -1; | |
| # if ENABLE_ASH_IDLE_TIMEOUT | |
| @@ -9738,7 +9738,7 @@ preadfd(void) | |
| } | |
| } | |
| #else | |
| - | nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1, /*loop_on_EINTR:*/ 1); |
| + | nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1); |
| #endif | |
| #if 0 /* disabled: nonblock_immune_read() handles this problem */ | |