diff --git a/src/core/ddsi/src/ddsi_udp.c b/src/core/ddsi/src/ddsi_udp.c index b3d4f11..32b45a5 100644 --- a/src/core/ddsi/src/ddsi_udp.c +++ b/src/core/ddsi/src/ddsi_udp.c @@ -53,7 +53,7 @@ static ssize_t ddsi_udp_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, s ssize_t ret; struct msghdr msghdr; os_sockaddr_storage src; - struct iovec msg_iov; + ddsi_iovec_t msg_iov; socklen_t srclen = (socklen_t) sizeof (src); msg_iov.iov_base = (void*) buf; diff --git a/src/core/ddsi/src/q_debmon.c b/src/core/ddsi/src/q_debmon.c index 9948de2..3005a7a 100644 --- a/src/core/ddsi/src/q_debmon.c +++ b/src/core/ddsi/src/q_debmon.c @@ -65,7 +65,7 @@ static int cpf (ddsi_tran_conn_t conn, const char *fmt, ...) else { va_list ap; - struct iovec iov; + ddsi_iovec_t iov; char buf[4096]; int n; va_start (ap, fmt); diff --git a/src/core/ddsi/src/q_xmsg.c b/src/core/ddsi/src/q_xmsg.c index 7f018a4..0141b67 100644 --- a/src/core/ddsi/src/q_xmsg.c +++ b/src/core/ddsi/src/q_xmsg.c @@ -74,7 +74,7 @@ struct nn_xmsg { size_t sz; int have_params; struct serdata *refd_payload; - struct iovec refd_payload_iov; + ddsi_iovec_t refd_payload_iov; int64_t maxdelay; #ifdef DDSI_INCLUDE_NETWORK_PARTITIONS uint32_t encoderid; @@ -199,7 +199,7 @@ struct nn_xpack ddsi_tran_conn_t conn; os_sem_t sem; size_t niov; - struct iovec iov[NN_XMSG_MAX_MESSAGE_IOVECS]; + ddsi_iovec_t iov[NN_XMSG_MAX_MESSAGE_IOVECS]; enum nn_xmsg_dstmode dstmode; union diff --git a/src/core/ddsi/src/sysdeps.c b/src/core/ddsi/src/sysdeps.c index b5b0eff..75c9702 100644 --- a/src/core/ddsi/src/sysdeps.c +++ b/src/core/ddsi/src/sysdeps.c @@ -149,7 +149,6 @@ ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags) ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags) { DWORD sent; - unsigned i; ssize_t ret; DDSI_IOVEC_MATCHES_WSABUF; @@ -160,12 +159,10 @@ ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags) assert (message->msg_controllen == 0); #endif - if (WSASendTo (fd, (const WSABUF *) message->msg_iov, message->msg_iovlen, &sent, flags, (SOCKADDR *) message->msg_name, message->msg_namelen, NULL, NULL) == 0) + if (WSASendTo (fd, (WSABUF *) message->msg_iov, message->msg_iovlen, &sent, flags, (SOCKADDR *) message->msg_name, message->msg_namelen, NULL, NULL) == 0) ret = (ssize_t) sent; else ret = -1; - if (bufs != stbufs) - os_free (bufs); return ret; } #endif