*) Renames done (deprecated functions wrapped):

     apr_filename_of_pathname -> apr_filepath_name_get
     apr_get_groupid -> apr_gid_get
     apr_get_groupname -> apr_gid_name_get
     apr_compare_groups -> apr_gid_compare
     apr_parse_addr_port -> apr_port_addr_parse
     apr_shutdown -> apr_socket_shutdown
     apr_bind -> apr_socket_bind
     apr_listen -> apr_socket_listen
     apr_accept -> apr_socket_accept
     apr_connect -> apr_socket_connect
     apr_send -> apr_socket_send
     apr_sendv -> apr_socket_sendv
     apr_sendto -> apr_socket_sendto
     apr_implode_gmt -> apr_time_exp_gmt_get
     apr_get_home_directory -> apr_uid_homepath_get
     apr_get_userid -> apr_uid_get
     apr_current_userid -> apr_uid_current
     apr_compare_users -> apr_uid_compare
     apr_get_username -> apr_uid_name_get
     apr_recvfrom -> apr_socket_recvfrom
     apr_sendfile -> apr_socket_sendfile
     apr_recv -> apr_socket_recv


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64043 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 54 insertions, 10 deletions

diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index 3762befbb..19dc63d90 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -95,7 +95,8 @@ apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
 
 #define SEND_WAIT APR_USEC_PER_SEC / 10
 
-APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
+APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf,
+                                          apr_size_t *len)
 {
     apr_ssize_t rv;
 	
@@ -128,7 +129,8 @@ APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, apr_size
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
+APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, char *buf, 
+                                          apr_size_t *len)
 {
     apr_ssize_t rv;
    
@@ -160,15 +162,18 @@ APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf, apr_size_t *le
 
 /* BeOS doesn't have writev for sockets so we use the following instead...
  */
-APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t * sock, const struct iovec *vec,
-                                    apr_int32_t nvec, apr_size_t *len)
+APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t * sock, 
+                                           const struct iovec *vec,
+                                           apr_int32_t nvec, apr_size_t *len)
 {
     *len = vec[0].iov_len;
-    return apr_send(sock, vec[0].iov_base, len);
+    return apr_socket_send(sock, vec[0].iov_base, len);
 }
 
-APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const char *buf, apr_size_t *len)
+APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock, 
+                                            apr_sockaddr_t *where,
+                                            apr_int32_t flags, const char *buf,
+                                            apr_size_t *len)
 {
     apr_ssize_t rv;
 
@@ -200,9 +205,10 @@ APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                                       apr_int32_t flags, char *buf,
-                                       apr_size_t *len)
+APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from,
+                                              apr_socket_t *sock,
+                                              apr_int32_t flags, char *buf,
+                                              apr_size_t *len)
 {
     apr_ssize_t rv;
 
@@ -243,4 +249,42 @@ APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
     return APR_SUCCESS;
 }
 
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf,
+                                   apr_size_t *len)
+{
+    return apr_socket_send(sock, buf, len);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t * sock, 
+                                    const struct iovec *vec,
+                                    apr_int32_t nvec, apr_size_t *len)
+{
+    return apr_socket_sendv(sock, vec, nvec, len);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
+                                     apr_int32_t flags, const char *buf,
+                                     apr_size_t *len)
+{
+    return apr_socket_sendto(sock, where, flags, buf, len);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
+                                       apr_int32_t flags, char *buf,
+                                       apr_size_t *len)
+{
+    return apr_socket_recvfrom(from, sock, flags, buf, len);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf, 
+                                   apr_size_t *len)
+{
+    return apr_socket_recv(sock, buf, len);
+}
+
 #endif