diff options
| author | Andreas Schneider <asn@samba.org> | 2014-06-02 08:36:49 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-06-02 09:12:36 +0200 |
| commit | 23b4fa4519a128773cd99d85e3aa7288f08bbbd3 (patch) | |
| tree | a6319591831243d98196d587727dac4997df13a3 | |
| parent | 52eabf4b886135d8ace300b5e7f29b26c86a7c01 (diff) | |
| download | socket_wrapper-23b4fa4519a128773cd99d85e3aa7288f08bbbd3.tar.gz socket_wrapper-23b4fa4519a128773cd99d85e3aa7288f08bbbd3.tar.xz socket_wrapper-23b4fa4519a128773cd99d85e3aa7288f08bbbd3.zip | |
tests: Fix conflicting variable name on Solaris.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | tests/test_echo_tcp_bind.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_echo_tcp_bind.c b/tests/test_echo_tcp_bind.c index d997c8b..d42679a 100644 --- a/tests/test_echo_tcp_bind.c +++ b/tests/test_echo_tcp_bind.c @@ -40,7 +40,7 @@ static void test_bind_ipv4(void **state) socklen_t salen = sizeof(struct sockaddr); struct sockaddr_in sin; socklen_t slen = sizeof(struct sockaddr_in); - struct sockaddr_un sun; + struct sockaddr_un addr_un; socklen_t sulen = sizeof(struct sockaddr_un); int rc; int s; @@ -110,10 +110,10 @@ static void test_bind_ipv4(void **state) assert_int_equal(rc, -1); assert_int_equal(errno, EAFNOSUPPORT); - sun = (struct sockaddr_un) { + addr_un = (struct sockaddr_un) { .sun_family = AF_UNIX, }; - rc = bind(s, (struct sockaddr *)&sun, sulen); + rc = bind(s, (struct sockaddr *)&addr_un, sulen); assert_int_equal(rc, -1); assert_int_equal(errno, EAFNOSUPPORT); @@ -377,7 +377,7 @@ static void test_bind_on_ipv6_sock(void **state) socklen_t slen = sizeof(struct sockaddr_in); struct sockaddr_in6 sin6; socklen_t slen6 = sizeof(struct sockaddr_in6); - struct sockaddr_un sun; + struct sockaddr_un addr_un; socklen_t sulen = sizeof(struct sockaddr_un); int rc; int s; @@ -387,9 +387,9 @@ static void test_bind_on_ipv6_sock(void **state) s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); assert_return_code(s, errno); - ZERO_STRUCT(sun); - sun.sun_family = AF_UNIX; - rc = bind(s, (struct sockaddr *)&sun, sulen); + ZERO_STRUCT(addr_un); + addr_un.sun_family = AF_UNIX; + rc = bind(s, (struct sockaddr *)&addr_un, sulen); assert_int_equal(rc, -1); /* FreeBSD uses EINVAL here... */ assert_true(errno == EAFNOSUPPORT || errno == EINVAL); |