diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-01-05 10:47:40 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-01-05 10:47:40 -0500 |
| commit | 3028f131c4a63cee49f7943cc660fcbd5d73db50 (patch) | |
| tree | ae3702061900b79b602dd63a0100172f6e204889 /net_ntrip.c | |
| parent | d77e09980c829a04ad921b44169a4dae1faf0cff (diff) | |
| download | gpsd-3028f131c4a63cee49f7943cc660fcbd5d73db50.tar.gz | |
Back out the part of Beat Bolli's change that would spin on EAGAIN.
Diffstat (limited to 'net_ntrip.c')
| -rw-r--r-- | net_ntrip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net_ntrip.c b/net_ntrip.c index 5dfe5331..669d8c20 100644 --- a/net_ntrip.c +++ b/net_ntrip.c @@ -195,7 +195,7 @@ static int ntrip_sourcetable_parse(int fd, char *buf, ssize_t blen, memset(&buf[len], 0, (size_t) (blen - len)); if ((rlen = recv(fd, &buf[len], (size_t) (blen - 1 - len), 0)) == -1) { - if (errno == EINTR || errno == EAGAIN) + if (errno == EINTR) continue; gpsd_report(LOG_ERROR, "ntrip stream read error %d on fd %d\n", errno, fd); @@ -393,7 +393,7 @@ static int ntrip_stream_open(const char *caster, const char *port, memset(buf, 0, sizeof(buf)); while (read(context->dsock, buf, sizeof(buf) - 1) == -1) { - if (errno == EINTR || errno == EAGAIN) + if (errno == EINTR) continue; gpsd_report(LOG_ERROR, "ntrip stream read error %d on fd %d\n", errno, context->dsock); |