diff options
| author | Mladen Turk <mturk@apache.org> | 2021-12-02 21:21:18 +0000 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2021-12-02 21:21:18 +0000 |
| commit | 6487330c38e3c0430782a5ceca674b94398f347f (patch) | |
| tree | ededff55d7051624a164926ea86ad603d6776026 /network_io | |
| parent | 2520ce23f2830c59cfc2786effbbe72903c49ad5 (diff) | |
| download | apr-6487330c38e3c0430782a5ceca674b94398f347f.tar.gz | |
Stage 3 in dismantling _WIN32_WCE ... cleanup code
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895508 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/sockaddr.c | 10 | ||||
| -rw-r--r-- | network_io/win32/sendrecv.c | 21 |
2 files changed, 0 insertions, 31 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index 1c807a10b..5cee61933 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -75,16 +75,6 @@ struct apr_ipsubnet_t { #define AIX_SERVNAME_HACK 0 #endif -#ifdef _WIN32_WCE -/* XXX: BS solution. Need an HAVE_GETSERVBYNAME and actually - * do something here, to provide the obvious proto mappings. - */ -static void *getservbyname(const char *name, const char *proto) -{ - return NULL; -} -#endif - static apr_status_t get_local_addr(apr_socket_t *sock) { sock->local_addr->salen = sizeof(sock->local_addr->sa); diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index ccae8c6a2..20d802042 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -47,12 +47,7 @@ APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf, wsaData.len = (u_long)*len; wsaData.buf = (char*) buf; -#ifndef _WIN32_WCE rv = WSASend(sock->socketdes, &wsaData, 1, &dwBytes, 0, NULL, NULL); -#else - rv = send(sock->socketdes, wsaData.buf, wsaData.len, 0); - dwBytes = rv; -#endif if (rv == SOCKET_ERROR) { lasterror = apr_get_netos_error(); *len = 0; @@ -77,12 +72,7 @@ APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, char *buf, wsaData.len = (u_long)*len; wsaData.buf = (char*) buf; -#ifndef _WIN32_WCE rv = WSARecv(sock->socketdes, &wsaData, 1, &dwBytes, &flags, NULL, NULL); -#else - rv = recv(sock->socketdes, wsaData.buf, wsaData.len, 0); - dwBytes = rv; -#endif if (rv == SOCKET_ERROR) { lasterror = apr_get_netos_error(); *len = 0; @@ -140,21 +130,10 @@ APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, } while (cur_len > 0); } -#ifndef _WIN32_WCE rv = WSASend(sock->socketdes, pWsaBuf, nvec, &dwBytes, 0, NULL, NULL); if (rv == SOCKET_ERROR) { rc = apr_get_netos_error(); } -#else - for (i = 0; i < nvec; i++) { - rv = send(sock->socketdes, pWsaBuf[i].buf, pWsaBuf[i].len, 0); - if (rv == SOCKET_ERROR) { - rc = apr_get_netos_error(); - break; - } - dwBytes += rv; - } -#endif if (nvec > WSABUF_ON_STACK) free(pWsaBuf); |