trawick 00/12/15 12:56:56
Modified: . aprlib.def
include apr_network_io.h
network_io/unix sa_common.c
Log:
axe apr_get_inaddr(); apr_getaddrinfo() does the equivalent function
(and more)
Revision Changes Path
1.53 +0 -1 apr/aprlib.def
Index: aprlib.def
===================================================================
RCS file: /home/cvs/apr/aprlib.def,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- aprlib.def 2000/12/14 15:57:08 1.52
+++ aprlib.def 2000/12/15 20:56:51 1.53
@@ -87,7 +87,6 @@
apr_set_ipaddr
apr_get_port
apr_set_port
- apr_get_inaddr
apr_parse_addr_port
apr_getnameinfo
1.90 +0 -7 apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apr/include/apr_network_io.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- apr_network_io.h 2000/12/13 22:30:21 1.89
+++ apr_network_io.h 2000/12/15 20:56:54 1.90
@@ -666,13 +666,6 @@
#endif
/**
- * Given a hostname and a port, create an apr_in_addr for it...
- * @param addr The apr_in_addr_t structure to return.
- * @param hostname The hostname to lookup.
- */
-apr_status_t apr_get_inaddr(apr_in_addr_t *addr, char *hostname);
-
-/**
* Given an apr_sockaddr_t and a service name, set the port for the service
* @param sockaddr The apr_sockaddr_t that will have it's port set
* @param servname The name of the service you wish to use
1.22 +0 -21 apr/network_io/unix/sa_common.c
Index: sa_common.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sa_common.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sa_common.c 2000/12/14 18:59:03 1.21
+++ sa_common.c 2000/12/15 20:56:55 1.22
@@ -130,27 +130,6 @@
return APR_SUCCESS;
}
-apr_status_t apr_get_inaddr(apr_in_addr_t *addr, char *hostname)
-{
- struct hostent *he;
-
- if (strcmp(hostname,"*") == 0){
- addr->s_addr = htonl(INADDR_ANY);
- return APR_SUCCESS;
- }
- if ((addr->s_addr = apr_inet_addr(hostname)) != APR_INADDR_NONE)
- return APR_SUCCESS;
-
- /* hmmm, it's not a numeric IP address so we need to look it up :( */
- he = gethostbyname(hostname);
- if (!he || he->h_addrtype != APR_INET || !he->h_addr_list[0])
- return (h_errno + APR_OS_START_SYSERR);
-
- *addr = *(struct in_addr*)he->h_addr_list[0];
-
- return APR_SUCCESS;
-}
-
static void set_sockaddr_vars(apr_sockaddr_t *addr, int family)
{
addr->sa.sin.sin_family = family;
