aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRon Yorston <rmy@tigress.co.uk>2015-04-19 10:50:25 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2015-04-20 13:41:32 +0200
commit61d6ae244af424b2a05468307723f21c8810ab9e (patch)
treeff29ec2307a60d1b8d4f110396042a6ec0a43274 /shell
parentad795510d9fd6f4290be170c84c0d30eb1af7245 (diff)
downloadbusybox-w32-61d6ae244af424b2a05468307723f21c8810ab9e.tar.gz
busybox-w32-61d6ae244af424b2a05468307723f21c8810ab9e.tar.bz2
busybox-w32-61d6ae244af424b2a05468307723f21c8810ab9e.zip
libbb: remove unnecessary argument to nonblock_immune_read
The loop_on_EINTR argument to nonblock_immune_read is always set to 1. function old new delta xmalloc_reads 200 195 -5 pgetc 488 483 -5 argstr 1313 1308 -5 nonblock_immune_read 123 86 -37 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-52) Total: -52 bytes Signed-off-by: Ron Yorston <rmy@tigress.co.uk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 697a64fea..c51fb804d 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5923,7 +5923,7 @@ expbackq(union node *cmd, int quoted, int quotes)
5923 read: 5923 read:
5924 if (in.fd < 0) 5924 if (in.fd < 0)
5925 break; 5925 break;
5926 i = nonblock_immune_read(in.fd, buf, sizeof(buf), /*loop_on_EINTR:*/ 1); 5926 i = nonblock_immune_read(in.fd, buf, sizeof(buf));
5927 TRACE(("expbackq: read returns %d\n", i)); 5927 TRACE(("expbackq: read returns %d\n", i));
5928 if (i <= 0) 5928 if (i <= 0)
5929 break; 5929 break;
@@ -9696,7 +9696,7 @@ preadfd(void)
9696#if ENABLE_FEATURE_EDITING 9696#if ENABLE_FEATURE_EDITING
9697 retry: 9697 retry:
9698 if (!iflag || g_parsefile->pf_fd != STDIN_FILENO) 9698 if (!iflag || g_parsefile->pf_fd != STDIN_FILENO)
9699 nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1, /*loop_on_EINTR:*/ 1); 9699 nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
9700 else { 9700 else {
9701 int timeout = -1; 9701 int timeout = -1;
9702# if ENABLE_ASH_IDLE_TIMEOUT 9702# if ENABLE_ASH_IDLE_TIMEOUT
@@ -9738,7 +9738,7 @@ preadfd(void)
9738 } 9738 }
9739 } 9739 }
9740#else 9740#else
9741 nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1, /*loop_on_EINTR:*/ 1); 9741 nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
9742#endif 9742#endif
9743 9743
9744#if 0 /* disabled: nonblock_immune_read() handles this problem */ 9744#if 0 /* disabled: nonblock_immune_read() handles this problem */