cvs: php-src(PHP_5_3) /ext/com_dotnet com_handlers.c com_iterator.c com_persist.c com_saproxy.c

kalle Tue May 19 17:38:29 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/com_dotnet com_handlers.c com_iterator.c com_persist.c com_saproxy.c Log: MFH: Fix compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.30.2.5.2.6.2.5&r2=1.30.2.5.2.6.2.6&diff_format=u Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.6.2.5 php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.6.2.6 --- php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.6.2.5 Wed Dec 31 11:15:35 2008 +++ php-src/ext/com_dotnet/com_handlers.c Tue May 19 17:38:29 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_handlers.c,v 1.30.2.5.2.6.2.5 2008/12/31 11:15:35 sebastian Exp $ */ +/* $Id: com_handlers.c,v 1.30.2.5.2.6.2.6 2009/05/19 17:38:29 kalle Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -434,7 +434,7 @@ } } -static zend_class_entry *com_class_entry_get(zval *object TSRMLS_DC) +static zend_class_entry *com_class_entry_get(const zval *object TSRMLS_DC) { php_com_dotnet_object *obj; obj = CDNO_FETCH(object); @@ -442,7 +442,7 @@ return obj->ce; } -static int com_class_name_get(zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC) +static int com_class_name_get(const zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC) { php_com_dotnet_object *obj; obj = CDNO_FETCH(object); http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_iterator.c?r1=1.9.2.2.2.2.2.2&r2=1.9.2.2.2.2.2.3&diff_format=u Index: php-src/ext/com_dotnet/com_iterator.c diff -u php-src/ext/com_dotnet/com_iterator.c:1.9.2.2.2.2.2.2 php-src/ext/com_dotnet/com_iterator.c:1.9.2.2.2.2.2.3 --- php-src/ext/com_dotnet/com_iterator.c:1.9.2.2.2.2.2.2 Wed Dec 31 11:15:35 2008 +++ php-src/ext/com_dotnet/com_iterator.c Tue May 19 17:38:29 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_iterator.c,v 1.9.2.2.2.2.2.2 2008/12/31 11:15:35 sebastian Exp $ */ +/* $Id: com_iterator.c,v 1.9.2.2.2.2.2.3 2009/05/19 17:38:29 kalle Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -111,7 +111,7 @@ } } else { /* safe array */ - if (I->key >= I->sa_max) { + if (I->key >= (ULONG) I->sa_max) { I->key = (ulong)-1; return FAILURE; } http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_persist.c?r1=1.5.2.3.2.2.2.3&r2=1.5.2.3.2.2.2.4&diff_format=u Index: php-src/ext/com_dotnet/com_persist.c diff -u php-src/ext/com_dotnet/com_persist.c:1.5.2.3.2.2.2.3 php-src/ext/com_dotnet/com_persist.c:1.5.2.3.2.2.2.4 --- php-src/ext/com_dotnet/com_persist.c:1.5.2.3.2.2.2.3 Wed Dec 31 11:15:35 2008 +++ php-src/ext/com_dotnet/com_persist.c Tue May 19 17:38:29 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_persist.c,v 1.5.2.3.2.2.2.3 2008/12/31 11:15:35 sebastian Exp $ */ +/* $Id: com_persist.c,v 1.5.2.3.2.2.2.4 2009/05/19 17:38:29 kalle Exp $ */ /* Infrastructure for working with persistent COM objects. * Implements: IStream* wrapper for PHP streams. @@ -157,7 +157,7 @@ return STG_E_INVALIDFUNCTION; } - offset = dlibMove.QuadPart; + offset = (off_t) dlibMove.QuadPart; ret = php_stream_seek(stm->stream, offset, whence); http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_saproxy.c?r1=1.15.2.2.2.3.2.4&r2=1.15.2.2.2.3.2.5&diff_format=u Index: php-src/ext/com_dotnet/com_saproxy.c diff -u php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2.2.3.2.4 php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2.2.3.2.5 --- php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2.2.3.2.4 Wed Dec 31 11:15:35 2008 +++ php-src/ext/com_dotnet/com_saproxy.c Tue May 19 17:38:29 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_saproxy.c,v 1.15.2.2.2.3.2.4 2008/12/31 11:15:35 sebastian Exp $ */ +/* $Id: com_saproxy.c,v 1.15.2.2.2.3.2.5 2009/05/19 17:38:29 kalle Exp $ */ /* This module implements a SafeArray proxy which is used internally * by the engine when resolving multi-dimensional array accesses on @@ -92,10 +92,9 @@ { php_com_saproxy *proxy = SA_FETCH(object); zval *return_value; - UINT dims; + UINT dims, i; SAFEARRAY *sa; LONG ubound, lbound; - int i; HRESULT res; MAKE_STD_ZVAL(return_value); @@ -110,7 +109,7 @@ args = safe_emalloc(proxy->dimensions + 1, sizeof(zval *), 0); - for (i = 1; i < proxy->dimensions; i++) { + for (i = 1; i < (UINT) proxy->dimensions; i++) { args[i-1] = proxy->indices[i]; } args[i-1] = offset; @@ -145,7 +144,7 @@ sa = V_ARRAY(&proxy->obj->v); dims = SafeArrayGetDim(sa); - if (proxy->dimensions >= dims) { + if ((UINT) proxy->dimensions >= dims) { /* too many dimensions */ php_com_throw_exception(E_INVALIDARG, "too many dimensions!" TSRMLS_CC); return return_value; @@ -212,8 +211,7 @@ static void saproxy_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC) { php_com_saproxy *proxy = SA_FETCH(object); - UINT dims; - int i; + UINT dims, i; HRESULT res; VARIANT v; @@ -223,7 +221,7 @@ * the final value */ zval **args = safe_emalloc(proxy->dimensions + 2, sizeof(zval *), 0); - for (i = 1; i < proxy->dimensions; i++) { + for (i = 1; i < (UINT) proxy->dimensions; i++) { args[i-1] = proxy->indices[i]; } args[i-1] = offset; @@ -340,12 +338,12 @@ return NULL; } -static zend_class_entry *saproxy_class_entry_get(zval *object TSRMLS_DC) +static zend_class_entry *saproxy_class_entry_get(const zval *object TSRMLS_DC) { return php_com_saproxy_class_entry; } -static int saproxy_class_name_get(zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC) +static int saproxy_class_name_get(const zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC) { *class_name = estrndup(php_com_saproxy_class_entry->name, php_com_saproxy_class_entry->name_length); *class_name_len = php_com_saproxy_class_entry->name_length;