summaryrefslogtreecommitdiff
path: root/network_io/os2
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2002-07-15 07:38:35 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2002-07-15 07:38:35 +0000
commita6d6443d0d7a4673feafb4fd4f692970e7f608cf (patch)
tree819973256b5ee5bc37499604a1cdcd6369161225 /network_io/os2
parent32d721dc08bcd099c6353d8f0c3e78bcf7b94541 (diff)
downloadapr-a6d6443d0d7a4673feafb4fd4f692970e7f608cf.tar.gz
Deprecate apr_get/setsockopt for apr_socket_opt_get/set
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63675 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io/os2')
-rw-r--r--network_io/os2/sockopt.c26
1 files changed, 22 insertions, 4 deletions
diff --git a/network_io/os2/sockopt.c b/network_io/os2/sockopt.c
index 05deb9e51..b2e156764 100644
--- a/network_io/os2/sockopt.c
+++ b/network_io/os2/sockopt.c
@@ -67,14 +67,16 @@
#include <sys/so_ioctl.h>
-APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, apr_interval_time_t t)
+APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock,
+ apr_interval_time_t t)
{
sock->timeout = t;
return APR_SUCCESS;
}
-APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on)
+APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
+ apr_int32_t opt, apr_int32_t on)
{
int one;
struct linger li;
@@ -131,14 +133,16 @@ APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt,
}
-APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock, apr_interval_time_t *t)
+APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock,
+ apr_interval_time_t *t)
{
*t = sock->timeout;
return APR_SUCCESS;
}
-APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t *on)
+APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
+ apr_int32_t opt, apr_int32_t *on)
{
switch(opt) {
case APR_SO_TIMEOUT:
@@ -152,6 +156,20 @@ APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock, apr_int32_t opt,
}
+/* 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)
{
if (gethostname(buf, len) == -1) {