diff options
| -rw-r--r-- | ext/sockets/php_sockets_win.c | 2 | ||||
| -rw-r--r-- | ext/sockets/php_sockets_win.h | 2 | ||||
| -rw-r--r-- | ext/sockets/sockets.c | 17 |
3 files changed, 11 insertions, 10 deletions
diff --git a/ext/sockets/php_sockets_win.c b/ext/sockets/php_sockets_win.c index f352ac4b5c..58ba1c6c23 100644 --- a/ext/sockets/php_sockets_win.c +++ b/ext/sockets/php_sockets_win.c @@ -52,7 +52,7 @@ ssize_t readv(SOCKET sock, const struct iovec *iov, int iovcnt) { 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; diff --git a/ext/sockets/php_sockets_win.h b/ext/sockets/php_sockets_win.h index 0d855c7e5d..5f725764f7 100644 --- a/ext/sockets/php_sockets_win.h +++ b/ext/sockets/php_sockets_win.h @@ -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; diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index e74c52aae2..5e685aa6f4 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1103,9 +1103,9 @@ PHP_FUNCTION(socket_iovec_alloc) 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 @@ PHP_FUNCTION(socket_iovec_fetch) 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 @@ PHP_FUNCTION(socket_iovec_delete) 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; |