summaryrefslogtreecommitdiff
path: root/lib/zclient.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2021-07-06 09:47:41 -0400
committerGitHub <noreply@github.com>2021-07-06 09:47:41 -0400
commitacb4c44ef8da8c1a155184a809647533237adca9 (patch)
tree66c81b756c79ff507088d82ccc2bea4614b3a300 /lib/zclient.c
parent4afc3218254264c20b38b32b085b430c34a86c24 (diff)
parente702605d80c26e94681b282d97c726df6c6871da (diff)
Merge pull request #8942 from ton31337/fix/cleanups_2
Another round of cleanup
Diffstat (limited to 'lib/zclient.c')
-rw-r--r--lib/zclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/zclient.c b/lib/zclient.c
index 1b4ac080cd..dc83227659 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -3812,7 +3812,8 @@ static int zclient_read(struct thread *thread)
zclient->t_read = NULL;
/* Read zebra header (if we don't have it already). */
- if ((already = stream_get_endp(zclient->ibuf)) < ZEBRA_HEADER_SIZE) {
+ already = stream_get_endp(zclient->ibuf);
+ if (already < ZEBRA_HEADER_SIZE) {
ssize_t nbyte;
if (((nbyte = stream_read_try(zclient->ibuf, zclient->sock,
ZEBRA_HEADER_SIZE - already))
@@ -3825,7 +3826,6 @@ static int zclient_read(struct thread *thread)
return zclient_failed(zclient);
}
if (nbyte != (ssize_t)(ZEBRA_HEADER_SIZE - already)) {
- /* Try again later. */
zclient_event(ZCLIENT_READ, zclient);
return 0;
}