cvs: php4 /ext/sockets sockets.c

jon Sun Jan 27 02:06:23 2002 EDT Modified files: /php4/ext/sockets sockets.c Log: Use socklen_t (instead of int) where appropriate. Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.88 php4/ext/sockets/sockets.c:1.89 --- php4/ext/sockets/sockets.c:1.88 Sun Jan 27 01:55:10 2002 +++ php4/ext/sockets/sockets.c Sun Jan 27 02:06:09 2002 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.88 2002/01/27 06:55:10 jon Exp $ */ +/* $Id: sockets.c,v 1.89 2002/01/27 07:06:09 jon Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -257,13 +257,13 @@ int accept_connect(php_socket *in_sock, php_socket **new_sock, struct sockaddr *la TSRMLS_DC) { - int m; + socklen_t salen; php_socket *out_sock = (php_socket*)emalloc(sizeof(php_socket)); *new_sock = out_sock; - m = sizeof(*la); + salen = sizeof(*la); - out_sock->bsd_socket = accept(in_sock->bsd_socket, la, &m); + out_sock->bsd_socket = accept(in_sock->bsd_socket, la, &salen); if (IS_INVALID_SOCKET(out_sock)) { PHP_SOCKET_ERROR(out_sock, "unable to accept incoming connection", errno); @@ -796,7 +796,7 @@ struct sockaddr_in *sin; struct sockaddr_un *s_un; char *addr_string; - int salen = sizeof(php_sockaddr_storage); + socklen_t salen = sizeof(php_sockaddr_storage); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|z", &arg1, &addr, &port) == FAILURE) return; @@ -851,7 +851,7 @@ struct sockaddr_in *sin; struct sockaddr_un *s_un; char *addr_string; - int salen = sizeof(php_sockaddr_storage); + socklen_t salen = sizeof(php_sockaddr_storage); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|z", &arg1, &arg2, &arg3) == FAILURE) return; @@ -1616,7 +1616,8 @@ php_socket *php_sock; struct sockaddr sa; char *addr; - int salen, flags, addr_len, port; + socklen_t salen; + int flags, addr_len, port; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrls|l", &arg1, &arg2, &flags, &addr, &addr_len, &port) == FAILURE) return;