trawick 02/04/01 06:13:45
Modified: include/arch/os2 networkio.h
include/arch/unix networkio.h
include/arch/win32 networkio.h
network_io/unix sa_common.c sockets.c
Log:
rename internal function apr_set_sockaddr_vars() to apr_sockaddr_vars_set()
Submitted by: Kevin Pilch-Bisson
Revision Changes Path
1.25 +1 -1 apr/include/arch/os2/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/os2/networkio.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- networkio.h 28 Mar 2002 18:17:02 -0000 1.24
+++ networkio.h 1 Apr 2002 14:13:44 -0000 1.25
@@ -103,7 +103,7 @@
const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t
size);
int apr_inet_pton(int af, const char *src, void *dst);
-void apr_set_sockaddr_vars(apr_sockaddr_t *, int, apr_port_t);
+void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
#endif /* ! NETWORK_IO_H */
1.53 +1 -1 apr/include/arch/unix/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/networkio.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- networkio.h 28 Mar 2002 18:17:02 -0000 1.52
+++ networkio.h 1 Apr 2002 14:13:45 -0000 1.53
@@ -164,7 +164,7 @@
const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t
size);
int apr_inet_pton(int af, const char *src, void *dst);
apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read);
-void apr_set_sockaddr_vars(apr_sockaddr_t *, int, apr_port_t);
+void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
#define apr_is_option_set(mask, option) ((mask & option) ==option)
1.23 +1 -1 apr/include/arch/win32/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/networkio.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- networkio.h 28 Mar 2002 18:17:02 -0000 1.22
+++ networkio.h 1 Apr 2002 14:13:45 -0000 1.23
@@ -86,7 +86,7 @@
const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t
size);
int apr_inet_pton(int af, const char *src, void *dst);
-void apr_set_sockaddr_vars(apr_sockaddr_t *, int, apr_port_t);
+void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
#endif /* ! NETWORK_IO_H */
1.54 +5 -5 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sa_common.c 28 Mar 2002 18:17:02 -0000 1.53
+++ sa_common.c 1 Apr 2002 14:13:45 -0000 1.54
@@ -164,7 +164,7 @@
return APR_SUCCESS;
}
-void apr_set_sockaddr_vars(apr_sockaddr_t *addr, int family, apr_port_t port)
+void apr_sockaddr_vars_set(apr_sockaddr_t *addr, int family, apr_port_t port)
{
addr->family = family;
addr->sa.sin.sin_family = family;
@@ -322,7 +322,7 @@
{
sa->pool = p;
memcpy(&sa->sa, ai->ai_addr, ai->ai_addrlen);
- apr_set_sockaddr_vars(sa, ai->ai_family, port);
+ apr_sockaddr_vars_set(sa, ai->ai_family, port);
}
#else
static void save_addrinfo(apr_pool_t *p, apr_sockaddr_t *sa,
@@ -330,7 +330,7 @@
{
sa->pool = p;
sa->sa.sin.sin_addr = ipaddr;
- apr_set_sockaddr_vars(sa, AF_INET, port);
+ apr_sockaddr_vars_set(sa, AF_INET, port);
}
#endif
@@ -393,7 +393,7 @@
}
else {
(*sa)->pool = p;
- apr_set_sockaddr_vars(*sa,
+ apr_sockaddr_vars_set(*sa,
family == APR_UNSPEC ? APR_INET : family,
port);
}
@@ -480,7 +480,7 @@
}
else {
(*sa)->pool = p;
- apr_set_sockaddr_vars(*sa,
+ apr_sockaddr_vars_set(*sa,
family == APR_UNSPEC ? APR_INET : family,
port);
}
1.96 +2 -2 apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sockets.c 28 Mar 2002 18:17:02 -0000 1.95
+++ sockets.c 1 Apr 2002 14:13:45 -0000 1.96
@@ -79,8 +79,8 @@
static void set_socket_vars(apr_socket_t *sock, int family, int type)
{
sock->type = type;
- apr_set_sockaddr_vars(sock->local_addr, family, 0);
- apr_set_sockaddr_vars(sock->remote_addr, family, 0);
+ apr_sockaddr_vars_set(sock->local_addr, family, 0);
+ apr_sockaddr_vars_set(sock->remote_addr, family, 0);
sock->netmask = 0;
#if defined(BEOS) && !defined(BEOS_BONE)
/* BeOS pre-BONE has TCP_NODELAY on by default and it can't be
