summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2002-03-12 23:10:38 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2002-03-12 23:10:38 +0000
commitbd823fab6c0a3771a25b7224a81bd6e9a552a73e (patch)
tree71a379f6679bd6cdb3847682ce45e2c539c59c52
parenta69b5a414d210a8d63a0eccb0f5f1949231a4b94 (diff)
downloadlibapr-bd823fab6c0a3771a25b7224a81bd6e9a552a73e.tar.gz
clean up the way we look at the family of an apr_sockaddr_t
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63112 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--test/sendfile.c2
-rw-r--r--test/server.c2
-rw-r--r--test/testpoll.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/sendfile.c b/test/sendfile.c
index 30797a12c..4ce4bb618 100644
--- a/test/sendfile.c
+++ b/test/sendfile.c
@@ -132,7 +132,7 @@ static void apr_setup(apr_pool_t **p, apr_socket_t **sock, int *family)
apr_strerror(rv, buf, sizeof buf));
exit(1);
}
- *family = localsa->sa.sin.sin_family;
+ *family = localsa->family;
}
}
diff --git a/test/server.c b/test/server.c
index 539da10ff..86fa9cea0 100644
--- a/test/server.c
+++ b/test/server.c
@@ -108,7 +108,7 @@ int main(int argc, const char * const argv[])
*/
APR_TEST_SUCCESS(rv, "Preparing sockaddr",
apr_sockaddr_info_get(&localsa, bind_to_ipaddr, APR_UNSPEC, 8021, 0, context))
- family = localsa->sa.sin.sin_family;
+ family = localsa->family;
}
APR_TEST_SUCCESS(rv, "Creating new socket",
diff --git a/test/testpoll.c b/test/testpoll.c
index 0f12b2936..a6247d332 100644
--- a/test/testpoll.c
+++ b/test/testpoll.c
@@ -72,7 +72,7 @@ static int make_socket(apr_socket_t **sock, apr_sockaddr_t **sa, apr_port_t port
printf("couldn't create control socket information, shutting down");
return 1;
}
- if (apr_socket_create(sock, (*sa)->sa.sin.sin_family, SOCK_DGRAM, p)
+ if (apr_socket_create(sock, (*sa)->family, SOCK_DGRAM, p)
!= APR_SUCCESS){
printf("couldn't create UDP socket, shutting down");
return 1;