cvs: php-src /ext/filter filter.c

jani Fri Sep 28 12:54:42 2007 UTC Modified files: /php-src/ext/filter filter.c Log: - Fix compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.87&r2=1.88&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.87 php-src/ext/filter/filter.c:1.88 --- php-src/ext/filter/filter.c:1.87 Thu Sep 27 18:28:39 2007 +++ php-src/ext/filter/filter.c Fri Sep 28 12:54:42 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.87 2007/09/27 18:28:39 dmitry Exp $ */ +/* $Id: filter.c,v 1.88 2007/09/28 12:54:42 jani Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -275,7 +275,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.87 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.88 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -637,7 +637,7 @@ static void php_filter_array_handler(zval *input, zval **op, zval *return_value TSRMLS_DC) /* {{{ */ { - char *arg_key; + zstr arg_key; uint arg_key_len; ulong index; HashPosition pos; @@ -673,8 +673,8 @@ zval_dtor(return_value); RETURN_FALSE; } - if (zend_hash_find(Z_ARRVAL_P(input), arg_key, arg_key_len, (void **)&tmp) != SUCCESS) { - add_assoc_null_ex(return_value, arg_key, arg_key_len); + if (zend_hash_find(Z_ARRVAL_P(input), arg_key.s, arg_key_len, (void **)&tmp) != SUCCESS) { + add_assoc_null_ex(return_value, arg_key.s, arg_key_len); } else { zval *nval; @@ -684,7 +684,7 @@ INIT_PZVAL(nval); php_filter_call(&nval, -1, arg_elm, 0, FILTER_REQUIRE_SCALAR TSRMLS_CC); - add_assoc_zval_ex(return_value, arg_key, arg_key_len, nval); + add_assoc_zval_ex(return_value, arg_key.s, arg_key_len, nval); } } } else {