apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/network_io/win32 sendrecv.c sockets.c sockopt.c
Date Wed, 03 Sep 2003 16:31:47 GMT
trawick     2003/09/03 09:31:47

  Modified:    .        CHANGES
               include  apr_file_io.h apr_network_io.h
               include/arch/unix apr_arch_inherit.h
               include/arch/win32 apr_arch_inherit.h
               network_io/beos sendrecv.c
               network_io/os2 sendrecv.c sendrecv_udp.c sockopt.c
               network_io/unix sendrecv.c sockopt.c
               network_io/win32 sendrecv.c sockets.c sockopt.c
  Log:
  axe these deprecated functions:
  
    apr_getsocketopt, apr_recv, apr_recvfrom, apr_send,
    apr_sendfile, apr_sendto, apr_sendv, apr_setsocketopt,
    apr_socket_set_inherit, apr_socket_unset_inherit
  
  Revision  Changes    Path
  1.428     +10 -0     apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.427
  retrieving revision 1.428
  diff -u -r1.427 -r1.428
  --- CHANGES	3 Sep 2003 14:43:52 -0000	1.427
  +++ CHANGES	3 Sep 2003 16:31:46 -0000	1.428
  @@ -5,9 +5,19 @@
        apr_accept                   -> apr_socket_accept
        apr_bind                     -> apr_socket_bind
        apr_connect                  -> apr_socket_connect
  +     apr_getsocketopt             -> apr_socket_opt_get
        apr_listen                   -> apr_socket_listen
  +     apr_recv                     -> apr_socket_recv
  +     apr_recvfrom                 -> apr_socket_recvfrom
  +     apr_send                     -> apr_socket_send
  +     apr_sendfile                 -> apr_socket_sendfile
  +     apr_sendto                   -> apr_socket_sendto
  +     apr_sendv                    -> apr_socket_sendv
  +     apr_setsocketopt             -> apr_socket_opt_set
        apr_shutdown                 -> apr_socket_shutdown
        apr_socket_create_ex         -> apr_socket_create
  +     apr_socket_set_inherit       -> apr_socket_inherit_set
  +     apr_socket_unset_inherit     -> apr_socket_inherit_unset
        MAX_SECONDS_TO_LINGER        -> APR_MAX_SECONDS_TO_LINGER
   
   Changes with APR 0.9.4
  
  
  
  1.145     +2 -2      apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_io.h,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- apr_file_io.h	23 Aug 2003 10:01:22 -0000	1.144
  +++ apr_file_io.h	3 Sep 2003 16:31:46 -0000	1.145
  @@ -107,7 +107,7 @@
   #define APR_FILE_NOCLEANUP 0x00800 /**< Do not register a cleanup when the file
                                           is opened */
   #define APR_SENDFILE_ENABLED 0x01000 /**< Advisory flag that this file should
  -                                          support apr_sendfile operation */
  +                                          support apr_socket_sendfile operation */
   /** @} */
   
   /**
  @@ -195,7 +195,7 @@
    *                               be closed when the pool is destroyed.
    *         APR_SENDFILE_ENABLED  Open with appropriate platform semantics
    *                               for sendfile operations.  Advisory only,
  - *                               apr_sendfile does not check this flag.
  + *                               apr_socket_sendfile does not check this flag.
    * </PRE>
    * @param perm Access permissions for file.
    * @param cont The pool to use.
  
  
  
  1.143     +0 -42     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.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- apr_network_io.h	3 Sep 2003 14:43:52 -0000	1.142
  +++ apr_network_io.h	3 Sep 2003 16:31:46 -0000	1.143
  @@ -489,10 +489,6 @@
   APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf, 
                                             apr_size_t *len);
   
  -/** @deprecated @see apr_socket_send */
  -APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, 
  -                                   apr_size_t *len);
  -
   /**
    * Send multiple packets of data over a network.
    * @param sock The socket to send the data over.
  @@ -514,11 +510,6 @@
                                              const struct iovec *vec,
                                              apr_int32_t nvec, apr_size_t *len);
   
  -/** @deprecated @see apr_socket_sendv */
  -APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t *sock, 
  -                                    const struct iovec *vec,
  -                                    apr_int32_t nvec, apr_size_t *len);
  -
   /**
    * @param sock The socket to send from
    * @param where The apr_sockaddr_t describing where to send the data
  @@ -531,11 +522,6 @@
                                               apr_int32_t flags, const char *buf, 
                                               apr_size_t *len);
   
  -/** @deprecated @see apr_socket_sendto */
  -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);
  -
   /**
    * @param from The apr_sockaddr_t to fill in the recipient info
    * @param sock The socket to use
  @@ -549,11 +535,6 @@
                                                 apr_int32_t flags, char *buf, 
                                                 apr_size_t *len);
    
  -/** @deprecated @see apr_socket_recvfrom */
  -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);
  -
   #if APR_HAS_SENDFILE || defined(DOXYGEN)
   
   /**
  @@ -578,11 +559,6 @@
                                                 apr_size_t *len,
                                                 apr_int32_t flags);
   
  -/** @deprecated @see apr_socket_sendfile */
  -APR_DECLARE(apr_status_t) apr_sendfile(apr_socket_t *sock, apr_file_t *file,
  -                                       apr_hdtr_t *hdtr, apr_off_t *offset,
  -                                       apr_size_t *len, apr_int32_t flags);
  -
   #endif /* APR_HAS_SENDFILE */
   
   /**
  @@ -606,10 +582,6 @@
   APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, 
                                      char *buf, apr_size_t *len);
   
  -/** @deprecated @see apr_socket_recv */
  -APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, 
  -                                   char *buf, apr_size_t *len);
  -
   /**
    * Setup socket options for the specified socket
    * @param sock The socket to set up.
  @@ -630,10 +602,6 @@
   APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
                                                apr_int32_t opt, apr_int32_t on);
   
  -/** @deprecated @see apr_socket_opt_set */
  -APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock,
  -                                           apr_int32_t opt, apr_int32_t on);
  -
   /**
    * Setup socket timeout for the specified socket
    * @param sock The socket to set up.
  @@ -670,10 +638,6 @@
   APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock, 
                                                apr_int32_t opt, apr_int32_t *on);
   
  -/** @deprecated @see apr_socket_opt_set */
  -APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock, 
  -                                           apr_int32_t opt, apr_int32_t *on);
  -
   /**
    * Query socket timeout for the specified socket
    * @param sock The socket to query
  @@ -812,16 +776,10 @@
    */
   APR_DECLARE_INHERIT_SET(socket);
   
  -/** @deprecated @see apr_socket_inherit_set */
  -APR_DECLARE(void) apr_socket_set_inherit(apr_socket_t *skt);
  -
   /**
    * Unset a socket from being inherited by child processes.
    */
   APR_DECLARE_INHERIT_UNSET(socket);
  -
  -/** @deprecated @see apr_socket_inherit_unset */
  -APR_DECLARE(void) apr_socket_unset_inherit(apr_socket_t *skt);
   
   /** @} */
   
  
  
  
  1.5       +0 -10     apr/include/arch/unix/apr_arch_inherit.h
  
  Index: apr_arch_inherit.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/apr_arch_inherit.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_arch_inherit.h	19 Mar 2003 04:35:11 -0000	1.4
  +++ apr_arch_inherit.h	3 Sep 2003 16:31:46 -0000	1.5
  @@ -71,11 +71,6 @@
                                      cleanup, apr_pool_cleanup_null); \
       }                                                               \
       return APR_SUCCESS;                                             \
  -}                                                                   \
  -/* Deprecated */                                                    \
  -void apr_##name##_set_inherit(apr_##name##_t *the##name)            \
  -{                                                                   \
  -    apr_##name##_inherit_set(the##name);                            \
   }
   
   #define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
  @@ -90,11 +85,6 @@
                                      cleanup, cleanup);               \
       }                                                               \
       return APR_SUCCESS;                                             \
  -}                                                                   \
  -/* Deprecated */                                                    \
  -void apr_##name##_unset_inherit(apr_##name##_t *the##name)          \
  -{                                                                   \
  -    apr_##name##_inherit_unset(the##name);                          \
   }
   
   #endif	/* ! INHERIT_H */
  
  
  
  1.2       +0 -10     apr/include/arch/win32/apr_arch_inherit.h
  
  Index: apr_arch_inherit.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/win32/apr_arch_inherit.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_arch_inherit.h	6 Jan 2003 23:44:27 -0000	1.1
  +++ apr_arch_inherit.h	3 Sep 2003 16:31:46 -0000	1.2
  @@ -80,11 +80,6 @@
           the##name->filehand = temp;                                 \
       }                                                               \
       return APR_SUCCESS;                                             \
  -}                                                                   \
  -/* Deprecated */                                                    \
  -APR_DECLARE(void) apr_##name##_set_inherit(apr_##name##_t *the##name) \
  -{                                                                   \
  -    apr_##name##_inherit_set(the##name);                            \
   }
   
   #define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
  @@ -107,11 +102,6 @@
           the##name->filehand = temp;                                 \
       }                                                               \
       return APR_SUCCESS;                                             \
  -}                                                                   \
  -/* Deprecated */                                                    \
  -APR_DECLARE(void) apr_##name##_unset_inherit(apr_##name##_t *the##name) \
  -{                                                                   \
  -    apr_##name##_inherit_unset(the##name);                          \
   }
   
   #endif	/* ! INHERIT_H */
  
  
  
  1.30      +0 -38     apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- sendrecv.c	6 Jan 2003 23:44:34 -0000	1.29
  +++ sendrecv.c	3 Sep 2003 16:31:47 -0000	1.30
  @@ -249,42 +249,4 @@
       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
  
  
  
  1.28      +0 -22     apr/network_io/os2/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sendrecv.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- sendrecv.c	6 Jan 2003 23:44:34 -0000	1.27
  +++ sendrecv.c	3 Sep 2003 16:31:47 -0000	1.28
  @@ -187,25 +187,3 @@
       *len = rv;
       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_recv(apr_socket_t *sock, char *buf,
  -                                   apr_size_t *len)
  -{
  -    return apr_socket_recv(sock, buf, len);
  -}
  
  
  
  1.11      +0 -18     apr/network_io/os2/sendrecv_udp.c
  
  Index: sendrecv_udp.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sendrecv_udp.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sendrecv_udp.c	6 Jan 2003 23:44:34 -0000	1.10
  +++ sendrecv_udp.c	3 Sep 2003 16:31:47 -0000	1.11
  @@ -140,21 +140,3 @@
   
       return APR_SUCCESS;
   }
  -
  -/* 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);
  -}
  -
  -
  -
  -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);
  -}
  
  
  
  1.34      +0 -14     apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- sockopt.c	24 Feb 2003 23:13:29 -0000	1.33
  +++ sockopt.c	3 Sep 2003 16:31:47 -0000	1.34
  @@ -156,20 +156,6 @@
   }
   
   
  -/* deprecated */
  -APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock,
  -                                           apr_int32_t opt, apr_int32_t on)
  -{
  -    return apr_socket_opt_set(sock, opt, on);
  -}
  -
  -APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock,
  -                                           apr_int32_t opt, apr_int32_t *on)
  -{
  -    return apr_socket_opt_get(sock, opt, on);
  -}
  -                                           
  -
   APR_DECLARE(apr_status_t) apr_gethostname(char *buf, apr_int32_t len, 
                                             apr_pool_t *cont)
   {
  
  
  
  1.100     +2 -46     apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- sendrecv.c	1 Aug 2003 11:06:52 -0000	1.99
  +++ sendrecv.c	3 Sep 2003 16:31:47 -0000	1.100
  @@ -1001,52 +1001,8 @@
   }
   #else
   #error APR has detected sendfile on your system, but nobody has written a
  -#error version of it for APR yet.  To get past this, either write apr_sendfile
  -#error or change APR_HAS_SENDFILE in apr.h to 0. 
  +#error version of it for APR yet.  To get past this, either write 
  +#error apr_socket_sendfile or change APR_HAS_SENDFILE in apr.h to 0.
   #endif /* __linux__, __FreeBSD__, __HPUX__, _AIX, __MVS__, Tru64/OSF1 */
   
  -/* deprecated */
  -apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
  -                          apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len,
  -                          apr_int32_t flags)
  -{
  -    return apr_socket_sendfile(sock, file, hdtr, offset, len, flags);
  -}
  -
   #endif /* APR_HAS_SENDFILE */
  -
  -/* deprecated */
  -apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
  -{
  -    return apr_socket_send(sock, buf, len);
  -}
  -
  -/* deprecated */
  -#ifdef HAVE_WRITEV
  -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);
  -}
  -#endif
  -
  -/* deprecated */
  -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_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_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
  -{
  -    return apr_socket_recv(sock, buf, len);
  -}
  
  
  
  1.71      +0 -14     apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- sockopt.c	30 May 2003 12:50:40 -0000	1.70
  +++ sockopt.c	3 Sep 2003 16:31:47 -0000	1.71
  @@ -369,20 +369,6 @@
   }
   
   
  -/* deprecated */
  -apr_status_t apr_setsocketopt(apr_socket_t *sock,
  -                              apr_int32_t opt, apr_int32_t on)
  -{
  -    return apr_socket_opt_set(sock, opt, on);
  -}
  -
  -apr_status_t apr_getsocketopt(apr_socket_t *sock,
  -                              apr_int32_t opt, apr_int32_t *on)
  -{
  -    return apr_socket_opt_get(sock, opt, on);
  -}
  -                                           
  -
   apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont)
   {
       if (gethostname(buf, len) == -1) {
  
  
  
  1.65      +2 -48     apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- sendrecv.c	7 Jan 2003 00:52:56 -0000	1.64
  +++ sendrecv.c	3 Sep 2003 16:31:47 -0000	1.65
  @@ -332,7 +332,7 @@
                               hdtrbuf, sizeof(hdtrbuf));
           /* If not enough buffer, punt to sendv */
           if (rv == APR_INCOMPLETE) {
  -            rv = apr_sendv(sock, hdtr->headers, hdtr->numheaders, &nbytes);
  +            rv = apr_socket_sendv(sock, hdtr->headers, hdtr->numheaders, &nbytes);
               if (rv != APR_SUCCESS)
                   return rv;
               *len += nbytes;
  @@ -436,7 +436,7 @@
   
       if (status == APR_SUCCESS) {
           if (sendv_trailers) {
  -            rv = apr_sendv(sock, hdtr->trailers, hdtr->numtrailers, &nbytes);
  +            rv = apr_socket_sendv(sock, hdtr->trailers, hdtr->numtrailers, &nbytes);
               if (rv != APR_SUCCESS)
                   return rv;
               *len += nbytes;
  @@ -460,51 +460,5 @@
       return status;
   }
   
  -/* Deprecated */
  -APR_DECLARE(apr_status_t) apr_sendfile(apr_socket_t *sock, apr_file_t *file,
  -                                       apr_hdtr_t *hdtr, apr_off_t *offset,
  -                                       apr_size_t *len, apr_int32_t flags) 
  -{
  -    return apr_socket_sendfile(sock, file, hdtr, offset, len, flags);
  -}
  -
   #endif
   
  -/* 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 *nbytes)
  -{
  -    return apr_socket_sendv(sock, vec, nvec, nbytes);
  -}
  -
  -/* 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);
  -}
  
  
  
  1.98      +1 -10     apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- sockets.c	3 Sep 2003 14:43:52 -0000	1.97
  +++ sockets.c	3 Sep 2003 16:31:47 -0000	1.98
  @@ -510,19 +510,10 @@
   {    
       return APR_ENOTIMPL;
   }    
  -/* Deprecated */    
  -APR_DECLARE(void) apr_socket_set_inherit(apr_socket_t *socket)    
  -{    
  -    apr_socket_inherit_set(socket);    
  -}
   
   APR_DECLARE(apr_status_t) apr_socket_inherit_unset(apr_socket_t *socket)    
   {    
       return APR_ENOTIMPL;
   }    
  -/* Deprecated */    
  -APR_DECLARE(void) apr_socket_unset_inherit(apr_socket_t *socket)    
  -{    
  -    apr_socket_inherit_unset(socket);    
  -}
  +
   
  
  
  
  1.53      +0 -14     apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- sockopt.c	24 Feb 2003 23:13:30 -0000	1.52
  +++ sockopt.c	3 Sep 2003 16:31:47 -0000	1.53
  @@ -262,20 +262,6 @@
   }
   
   
  -/* deprecated */
  -APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock,
  -                                           apr_int32_t opt, apr_int32_t on)
  -{
  -    return apr_socket_opt_set(sock, opt, on);
  -}
  -
  -APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock,
  -                                           apr_int32_t opt, apr_int32_t *on)
  -{
  -    return apr_socket_opt_get(sock, opt, on);
  -}
  -                                           
  -
   APR_DECLARE(apr_status_t) apr_gethostname(char *buf, int len,
                                             apr_pool_t *cont)
   {
  
  
  

Mime
View raw message