trawick 02/03/12 15:10:39
Modified: test sendfile.c server.c testpoll.c
Log:
clean up the way we look at the family of an apr_sockaddr_t
Revision Changes Path
1.19 +1 -1 apr/test/sendfile.c
Index: sendfile.c
===================================================================
RCS file: /home/cvs/apr/test/sendfile.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sendfile.c 12 Dec 2001 11:46:02 -0000 1.18
+++ sendfile.c 12 Mar 2002 23:10:38 -0000 1.19
@@ -132,7 +132,7 @@
apr_strerror(rv, buf, sizeof buf));
exit(1);
}
- *family = localsa->sa.sin.sin_family;
+ *family = localsa->family;
}
}
1.33 +1 -1 apr/test/server.c
Index: server.c
===================================================================
RCS file: /home/cvs/apr/test/server.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- server.c 27 Jul 2001 17:46:01 -0000 1.32
+++ server.c 12 Mar 2002 23:10:38 -0000 1.33
@@ -108,7 +108,7 @@
*/
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",
1.7 +1 -1 apr/test/testpoll.c
Index: testpoll.c
===================================================================
RCS file: /home/cvs/apr/test/testpoll.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testpoll.c 1 Aug 2001 21:06:26 -0000 1.6
+++ testpoll.c 12 Mar 2002 23:10:38 -0000 1.7
@@ -72,7 +72,7 @@
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;