X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fldp.c;h=0dbc6a51efcc5fbab3543383bc5e7f4d0f399e74;hb=07063b8ea;hp=95c0edcff0ab4b6a4a1c4272d1b8181516996388;hpb=067f9544d52c95c0b60b0e8425fce1e295120180;p=vpp.git diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index 95c0edcff0a..0dbc6a51efc 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -448,24 +448,20 @@ writev (int fd, const struct iovec * iov, int iovcnt) vlsh = ldp_fd_to_vlsh (fd); if (vlsh != VLS_INVALID_HANDLE) { - do + for (i = 0; i < iovcnt; ++i) { - for (i = 0; i < iovcnt; ++i) + rv = vls_write_msg (vlsh, iov[i].iov_base, iov[i].iov_len); + if (rv < 0) + break; + else { - rv = vls_write_msg (vlsh, iov[i].iov_base, iov[i].iov_len); - if (rv < 0) + total += rv; + if (rv < iov[i].iov_len) break; - else - { - total += rv; - if (rv < iov[i].iov_len) - break; - } } } - while ((rv >= 0) && (total == 0)); - if (rv < 0) + if (rv < 0 && total == 0) { errno = -rv; size = -1; @@ -1506,7 +1502,10 @@ recv (int fd, void *buf, size_t n, int flags) { size = vls_recvfrom (vlsh, buf, n, flags, NULL); if (size < 0) - errno = -size; + { + errno = -size; + size = -1; + } } else {