[SCM] Socket Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  73b2b4f swrap: Fix compare of signed and unsigned integer expressions
       via  6c1f075 tests: Fix compile warning
      from  f635b31 Bump version to 1.1.5

https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 73b2b4f16b4b5f51d4e13fba7444844e13a9f7cc
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 16 16:52:46 2015 +0200

    swrap: Fix compare of signed and unsigned integer expressions
    
    Make sure the values are compared as the same type. iov_len is size_t on
    Linux and int on Solaris.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 6c1f0750b122bacbf6bca126ce0e13ccd1e31fe3
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 16 16:50:00 2015 +0200

    tests: Fix compile warning
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 src/socket_wrapper.c       | 6 ++++--
 tests/test_echo_tcp_bind.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 353ad1d..6691738 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -3850,7 +3850,8 @@ static ssize_t swrap_sendmsg_before(int fd,
 		msg->msg_iovlen = i;
 		if (msg->msg_iovlen == 0) {
 			*tmp_iov = msg->msg_iov[0];
-			tmp_iov->iov_len = MIN(tmp_iov->iov_len, (size_t)mtu);
+			tmp_iov->iov_len = MIN((size_t)tmp_iov->iov_len,
+					       (size_t)mtu);
 			msg->msg_iov = tmp_iov;
 			msg->msg_iovlen = 1;
 		}
@@ -4067,7 +4068,8 @@ static int swrap_recvmsg_before(int fd,
 		msg->msg_iovlen = i;
 		if (msg->msg_iovlen == 0) {
 			*tmp_iov = msg->msg_iov[0];
-			tmp_iov->iov_len = MIN(tmp_iov->iov_len, (size_t)mtu);
+			tmp_iov->iov_len = MIN((size_t)tmp_iov->iov_len,
+					       (size_t)mtu);
 			msg->msg_iov = tmp_iov;
 			msg->msg_iovlen = 1;
 		}
diff --git a/tests/test_echo_tcp_bind.c b/tests/test_echo_tcp_bind.c
index 0baf0bd..cde7e3f 100644
--- a/tests/test_echo_tcp_bind.c
+++ b/tests/test_echo_tcp_bind.c
@@ -365,7 +365,7 @@ static void test_bindresvport_ipv4(void **state)
 		       &addr.sa.in.sin_addr);
 	assert_int_equal(rc, 1);
 
-	rc = connect(s, &addr.sa.in, addr.sa_socklen);
+	rc = connect(s, &addr.sa.s, addr.sa_socklen);
 	assert_return_code(rc, errno);
 
 	close(s);


-- 
Socket Wrapper Repository