diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-07-06 09:47:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 09:47:41 -0400 |
| commit | acb4c44ef8da8c1a155184a809647533237adca9 (patch) | |
| tree | 66c81b756c79ff507088d82ccc2bea4614b3a300 /lib/stream.c | |
| parent | 4afc3218254264c20b38b32b085b430c34a86c24 (diff) | |
| parent | e702605d80c26e94681b282d97c726df6c6871da (diff) | |
Merge pull request #8942 from ton31337/fix/cleanups_2
Another round of cleanup
Diffstat (limited to 'lib/stream.c')
| -rw-r--r-- | lib/stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/stream.c b/lib/stream.c index 904ee73b10..1557500c60 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -1097,7 +1097,8 @@ ssize_t stream_read_try(struct stream *s, int fd, size_t size) return -1; } - if ((nbytes = read(fd, s->data + s->endp, size)) >= 0) { + nbytes = read(fd, s->data + s->endp, size); + if (nbytes >= 0) { s->endp += nbytes; return nbytes; } @@ -1126,9 +1127,8 @@ ssize_t stream_recvfrom(struct stream *s, int fd, size_t size, int flags, return -1; } - if ((nbytes = recvfrom(fd, s->data + s->endp, size, flags, from, - fromlen)) - >= 0) { + nbytes = recvfrom(fd, s->data + s->endp, size, flags, from, fromlen); + if (nbytes >= 0) { s->endp += nbytes; return nbytes; } |