summaryrefslogtreecommitdiff
path: root/network_io
diff options
context:
space:
mode:
authorBill Stoddard <stoddard@apache.org>1999-10-04 22:44:19 +0000
committerBill Stoddard <stoddard@apache.org>1999-10-04 22:44:19 +0000
commit8cb881b1a739ac9a9588cd385bd224c13d5a1924 (patch)
treed046fd187cf7cba99f0c51046eba35497447977c /network_io
parent59d6ac46994917f38b46a483c07a83394838f0f2 (diff)
downloadapr-8cb881b1a739ac9a9588cd385bd224c13d5a1924.tar.gz
A few more argument changes missed by Ryan's patch
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@59263 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
-rw-r--r--network_io/win32/poll.c2
-rw-r--r--network_io/win32/sockets.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/network_io/win32/poll.c b/network_io/win32/poll.c
index 4e2909180..1d894f157 100644
--- a/network_io/win32/poll.c
+++ b/network_io/win32/poll.c
@@ -199,7 +199,7 @@ ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock, ap_in
ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
{
if (pollfd != NULL) {
- return ap_get_userdata(pollfd->cntxt, key, &data);
+ return ap_get_userdata(&data, pollfd->cntxt, key);
}
else {
data = NULL;
diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c
index 10cfe9440..d088265ed 100644
--- a/network_io/win32/sockets.c
+++ b/network_io/win32/sockets.c
@@ -267,7 +267,7 @@ ap_status_t ap_connect(struct socket_t *sock, char *hostname)
ap_status_t ap_get_socketdata(struct socket_t *socket, char *key, void *data)
{
if (socket != NULL) {
- return ap_get_userdata(socket->cntxt, key, &data);
+ return ap_get_userdata(&data, socket->cntxt, key);
}
else {
data = NULL;
@@ -296,8 +296,8 @@ ap_status_t ap_get_os_sock(struct socket_t *sock, ap_os_sock_t *thesock)
return APR_SUCCESS;
}
-ap_status_t ap_put_os_sock(ap_context_t *cont, struct socket_t **sock,
- ap_os_sock_t *thesock)
+ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock,
+ ap_context_t *cont)
{
if (cont == NULL) {
return APR_ENOCONT;