From 71f0fa52521199a54f5fda7963f03f47d40613f0 Mon Sep 17 00:00:00 2001 From: Martin Bremmer Date: Mon, 25 Mar 2019 16:12:56 +0100 Subject: [PATCH] Fixed ddsi connection writes return values. Signed-off-by: Martin Bremmer --- src/core/ddsi/src/ddsi_raweth.c | 2 +- src/core/ddsi/src/ddsi_tcp.c | 2 +- src/core/ddsi/src/ddsi_udp.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/ddsi/src/ddsi_raweth.c b/src/core/ddsi/src/ddsi_raweth.c index edad8b4..be789b9 100644 --- a/src/core/ddsi/src/ddsi_raweth.c +++ b/src/core/ddsi/src/ddsi_raweth.c @@ -160,7 +160,7 @@ static ssize_t ddsi_raweth_conn_write (ddsi_tran_conn_t conn, const nn_locator_t { DDS_ERROR("ddsi_raweth_conn_write failed with retcode %d", rc); } - return ret; + return (rc == DDS_RETCODE_OK ? ret : -1); } static ddsrt_socket_t ddsi_raweth_conn_handle (ddsi_tran_base_t base) diff --git a/src/core/ddsi/src/ddsi_tcp.c b/src/core/ddsi/src/ddsi_tcp.c index da89126..4309baf 100644 --- a/src/core/ddsi/src/ddsi_tcp.c +++ b/src/core/ddsi/src/ddsi_tcp.c @@ -530,7 +530,7 @@ static ssize_t ddsi_tcp_conn_write (ddsi_tran_conn_t base, const nn_locator_t *d char msgbuf[4096]; /* stack buffer for merging smallish writes without requiring allocations */ ddsrt_iovec_t iovec; /* iovec used for msgbuf */ #endif - ssize_t ret; + ssize_t ret = -1; size_t len; ddsi_tcp_conn_t conn; int piecewise; diff --git a/src/core/ddsi/src/ddsi_udp.c b/src/core/ddsi/src/ddsi_udp.c index 2623515..0234c8f 100644 --- a/src/core/ddsi/src/ddsi_udp.c +++ b/src/core/ddsi/src/ddsi_udp.c @@ -117,7 +117,7 @@ static void set_msghdr_iov (ddsrt_msghdr_t *mhdr, ddsrt_iovec_t *iov, size_t iov static ssize_t ddsi_udp_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *dst, size_t niov, const ddsrt_iovec_t *iov, uint32_t flags) { dds_retcode_t rc; - ssize_t ret; + ssize_t ret = -1; unsigned retry = 2; int sendflags = 0; ddsrt_msghdr_t msg; @@ -169,7 +169,7 @@ static ssize_t ddsi_udp_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *d { DDS_ERROR("ddsi_udp_conn_write failed with retcode %d", rc); } - return ret; + return (rc == DDS_RETCODE_OK ? ret : -1); } static void ddsi_udp_disable_multiplexing (ddsi_tran_conn_t base)