cvs: php4 /ext/sockets php_sockets.h php_sockets_win.c php_sockets_win.h sockets.c

dbeu Thu Nov 1 15:10:17 2001 EDT Modified files: /php4/ext/sockets php_sockets.h php_sockets_win.c php_sockets_win.h sockets.c Log: nuke remaining warnings Index: php4/ext/sockets/php_sockets.h diff -u php4/ext/sockets/php_sockets.h:1.15 php4/ext/sockets/php_sockets.h:1.16 --- php4/ext/sockets/php_sockets.h:1.15 Thu Nov 1 12:25:56 2001 +++ php4/ext/sockets/php_sockets.h Thu Nov 1 15:10:17 2001 @@ -22,7 +22,7 @@ #ifndef PHP_SOCKETS_H #define PHP_SOCKETS_H -/* $Id: php_sockets.h,v 1.15 2001/11/01 17:25:56 dbeu Exp $ */ +/* $Id: php_sockets.h,v 1.16 2001/11/01 20:10:17 dbeu Exp $ */ #if HAVE_SOCKETS Index: php4/ext/sockets/php_sockets_win.c diff -u php4/ext/sockets/php_sockets_win.c:1.2 php4/ext/sockets/php_sockets_win.c:1.3 --- php4/ext/sockets/php_sockets_win.c:1.2 Mon Sep 17 09:21:10 2001 +++ php4/ext/sockets/php_sockets_win.c Thu Nov 1 15:10:17 2001 @@ -52,7 +52,7 @@ remain = bytes = (size_t) retval; for(i=0; i<iovcnt; i++) { - len = (iov[i].iov_len < remain) ? iov[i].iov_len : remain; + len = ((unsigned int)iov[i].iov_len < remain) ? iov[i].iov_len : remain; memcpy(iov[i].iov_base, buffer+pos, len); pos += len; remain -= len; Index: php4/ext/sockets/php_sockets_win.h diff -u php4/ext/sockets/php_sockets_win.h:1.3 php4/ext/sockets/php_sockets_win.h:1.4 --- php4/ext/sockets/php_sockets_win.h:1.3 Thu Nov 1 11:51:59 2001 +++ php4/ext/sockets/php_sockets_win.h Thu Nov 1 15:10:17 2001 @@ -42,7 +42,7 @@ #define close(a) closesocket(a) #define CMSG_DATA(cmsg) ((cmsg)->cmsg_data) -typedef long ssize_t; +typedef int ssize_t; struct sockaddr_un { short sun_family; Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.74 php4/ext/sockets/sockets.c:1.75 --- php4/ext/sockets/sockets.c:1.74 Thu Nov 1 12:25:56 2001 +++ php4/ext/sockets/sockets.c Thu Nov 1 15:10:17 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.74 2001/11/01 17:25:56 dbeu Exp $ */ +/* $Id: sockets.c,v 1.75 2001/11/01 20:10:17 dbeu Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1103,9 +1103,9 @@ Returns the data held in the iovec specified by iovec_id[iovec_position] */ PHP_FUNCTION(socket_iovec_fetch) { - zval *iovec_id; - php_iovec_t *vector; - int iovec_position; + zval *iovec_id; + php_iovec_t *vector; + unsigned int iovec_position; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &iovec_id, &iovec_position) == FAILURE) return; @@ -1125,10 +1125,11 @@ Sets the data held in iovec_id[iovec_position] to new_val */ PHP_FUNCTION(socket_iovec_set) { - zval *iovec_id; - php_iovec_t *vector; - int iovec_position, new_val_len; - char *new_val; + zval *iovec_id; + php_iovec_t *vector; + int new_val_len; + unsigned int iovec_position; + char *new_val; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &iovec_id, &iovec_position, &new_val, &new_val_len) == FAILURE) return; @@ -1186,7 +1187,7 @@ zval *iovec_id; php_iovec_t *vector; struct iovec *vector_array; - int i, iov_pos; + unsigned int i, iov_pos; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &iovec_id, &iov_pos) == FAILURE) return;