summaryrefslogtreecommitdiff
path: root/ext/com_dotnet/com_saproxy.c
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2009-05-19 17:38:29 +0000
committerKalle Sommer Nielsen <kalle@php.net>2009-05-19 17:38:29 +0000
commitff88b45ffca806c0d8d9c5c432535c57da930fa6 (patch)
tree80b0827af2da6235319a41816ed08def1ad4a838 /ext/com_dotnet/com_saproxy.c
parent70fb8c85f1f69264a0c56d6677be3f6bca7303ba (diff)
downloadphp-git-ff88b45ffca806c0d8d9c5c432535c57da930fa6.tar.gz
MFH: Fix compiler warnings
Diffstat (limited to 'ext/com_dotnet/com_saproxy.c')
-rw-r--r--ext/com_dotnet/com_saproxy.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
index e7310c4498..25a2f77c8d 100644
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@ -92,10 +92,9 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
{
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 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
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 @@ static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
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 zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_
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 @@ static void saproxy_write_dimension(zval *object, zval *offset, zval *value TSRM
* 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 @@ static union _zend_function *saproxy_constructor_get(zval *object TSRMLS_DC)
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;