mturk 2005/06/18 07:03:09 Modified: jni/native/include tcn.h jni/native/src network.c sslnetwork.c Log: Use apr_socket_t as proto for socket callback to make compilers happy about struct pointers. Revision Changes Path 1.23 +6 -6 jakarta-tomcat-connectors/jni/native/include/tcn.h Index: tcn.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- tcn.h 18 Jun 2005 08:03:21 -0000 1.22 +++ tcn.h 18 Jun 2005 14:03:09 -0000 1.23 @@ -118,11 +118,11 @@ void *opaque; int type; apr_status_t (*cleanup)(void *); - apr_status_t (APR_THREAD_FUNC *send) (void *, const char *, apr_size_t *); - apr_status_t (APR_THREAD_FUNC *sendv)(void *, const struct iovec *, apr_int32_t, apr_size_t *); - apr_status_t (APR_THREAD_FUNC *recv) (void *, char *, apr_size_t *); - apr_status_t (APR_THREAD_FUNC *close) (void *); - apr_status_t (APR_THREAD_FUNC *shutdown) (void *, apr_shutdown_how_e); + apr_status_t (APR_THREAD_FUNC *send) (apr_socket_t *, const char *, apr_size_t *); + apr_status_t (APR_THREAD_FUNC *sendv)(apr_socket_t *, const struct iovec *, apr_int32_t, apr_size_t *); + apr_status_t (APR_THREAD_FUNC *recv) (apr_socket_t *, char *, apr_size_t *); + apr_status_t (APR_THREAD_FUNC *close) (apr_socket_t *); + apr_status_t (APR_THREAD_FUNC *shutdown) (apr_socket_t *, apr_shutdown_how_e); } tcn_socket_t; 1.32 +9 -9 jakarta-tomcat-connectors/jni/native/src/network.c Index: network.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- network.c 18 Jun 2005 12:02:51 -0000 1.31 +++ network.c 18 Jun 2005 14:03:09 -0000 1.32 @@ -188,28 +188,28 @@ #if defined(DEBUG) || defined(_DEBUG) static APR_INLINE apr_status_t APR_THREAD_FUNC -APR_socket_send(void *sock, const char *buf, apr_size_t *len) +APR_socket_send(apr_socket_t *sock, const char *buf, apr_size_t *len) { - return apr_socket_send((apr_socket_t *)sock, buf, len); + return apr_socket_send(sock, buf, len); } static APR_INLINE apr_status_t APR_THREAD_FUNC -APR_socket_recv(void *sock, char *buf, apr_size_t *len) +APR_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) { - return apr_socket_recv((apr_socket_t *)sock, buf, len); + return apr_socket_recv(sock, buf, len); } static APR_INLINE apr_status_t APR_THREAD_FUNC -APR_socket_sendv(void *sock, const struct iovec *vec, +APR_socket_sendv(apr_socket_t *sock, const struct iovec *vec, apr_int32_t nvec, apr_size_t *len) { - return apr_socket_sendv((apr_socket_t *)sock, vec, nvec, len); + return apr_socket_sendv(sock, vec, nvec, len); } static APR_INLINE apr_status_t APR_THREAD_FUNC -APR_socket_shutdown(void *sock, apr_shutdown_how_e how) +APR_socket_shutdown(apr_socket_t *sock, apr_shutdown_how_e how) { - return apr_socket_shutdown((apr_socket_t *)sock, how); + return apr_socket_shutdown(sock, how); } #else 1.17 +8 -7 jakarta-tomcat-connectors/jni/native/src/sslnetwork.c Index: sslnetwork.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/sslnetwork.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sslnetwork.c 18 Jun 2005 08:01:54 -0000 1.16 +++ sslnetwork.c 18 Jun 2005 14:03:09 -0000 1.17 @@ -206,7 +206,7 @@ } static apr_status_t APR_THREAD_FUNC -ssl_socket_shutdown(void *sock, apr_shutdown_how_e how) +ssl_socket_shutdown(apr_socket_t *sock, apr_shutdown_how_e how) { apr_status_t rv = APR_SUCCESS; tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock; @@ -223,7 +223,7 @@ } static apr_status_t APR_THREAD_FUNC -ssl_socket_close(void *sock) +ssl_socket_close(apr_socket_t *sock) { tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock; apr_status_t rv = APR_SUCCESS; @@ -309,7 +309,7 @@ } static apr_status_t APR_THREAD_FUNC -ssl_socket_recv(void *sock, char *buf, apr_size_t *len) +ssl_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) { tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock; int s, rd = (int)(*len); @@ -356,7 +356,7 @@ } static apr_status_t APR_THREAD_FUNC -ssl_socket_send(void *sock, const char *buf, +ssl_socket_send(apr_socket_t *sock, const char *buf, apr_size_t *len) { tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock; @@ -399,7 +399,7 @@ } static apr_status_t APR_THREAD_FUNC -ssl_socket_sendv(void *sock, +ssl_socket_sendv(apr_socket_t *sock, const struct iovec *vec, apr_int32_t nvec, apr_size_t *len) { @@ -410,7 +410,8 @@ for (i = 0; i < nvec; i++) { apr_size_t rd = vec[i].iov_len; - if ((rv = ssl_socket_send(con, vec[i].iov_base, &rd)) != APR_SUCCESS) { + if ((rv = ssl_socket_send((apr_socket_t *)con, + vec[i].iov_base, &rd)) != APR_SUCCESS) { *len = readed; return rv; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]