mike Tue Oct 3 05:57:52 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
Log:
- fix (ZTS) build
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.18&r2=1.52.2.19&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.18
php-src/ext/filter/filter.c:1.52.2.19
--- php-src/ext/filter/filter.c:1.52.2.18 Tue Oct 3 02:16:52 2006
+++ php-src/ext/filter/filter.c Tue Oct 3 05:57:52 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.18 2006/10/03 02:16:52 iliaa Exp $ */
+/* $Id: filter.c,v 1.52.2.19 2006/10/03 05:57:52 mike Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -273,8 +273,8 @@
PHP_MINFO_FUNCTION(filter)
{
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.52.2.18 $");
+ php_info_print_table_header( 2, "Input Validation and Filtering",
"enabled" );
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.19 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -511,7 +511,7 @@
/* }}} */
-static void php_filter_call(zval **filtered, long filter, zval **filter_args,
const int copy, long filter_flags)
+static void php_filter_call(zval **filtered, long filter, zval **filter_args,
const int copy, long filter_flags TSRMLS_DC)
{
zval *options = NULL;
zval **option;
@@ -580,7 +580,7 @@
}
}
-static void php_filter_array_handler(zval *input, zval **op, zval
*return_value)
+static void php_filter_array_handler(zval *input, zval **op, zval
*return_value TSRMLS_DC)
{
char *arg_key;
uint arg_key_len;
@@ -591,11 +591,11 @@
if (!op) {
SEPARATE_ZVAL(&input);
*return_value = *input;
- php_filter_call(&return_value, FILTER_DEFAULT, NULL, 0,
FILTER_REQUIRE_ARRAY);
+ php_filter_call(&return_value, FILTER_DEFAULT, NULL, 0,
FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_LONG) {
SEPARATE_ZVAL(&input);
*return_value = *input;
- php_filter_call(&return_value, Z_LVAL_PP(op), NULL, 0,
FILTER_REQUIRE_ARRAY);
+ php_filter_call(&return_value, Z_LVAL_PP(op), NULL, 0,
FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_ARRAY) {
array_init(return_value);
@@ -619,7 +619,7 @@
zval_copy_ctor(nval);
INIT_PZVAL(nval);
- php_filter_call(&nval, -1, arg_elm, 0,
FILTER_REQUIRE_SCALAR);
+ 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);
}
}
@@ -651,7 +651,7 @@
*return_value = **tmp;
zval_copy_ctor(return_value); /* Watch out for empty strings */
- php_filter_call(&return_value, filter, filter_args, 1,
FILTER_REQUIRE_SCALAR);
+ php_filter_call(&return_value, filter, filter_args, 1,
FILTER_REQUIRE_SCALAR TSRMLS_CC);
}
/* }}} */
@@ -670,7 +670,7 @@
*return_value = *data;
zval_copy_ctor(data);
- php_filter_call(&return_value, filter, filter_args, 1,
FILTER_REQUIRE_SCALAR);
+ php_filter_call(&return_value, filter, filter_args, 1,
FILTER_REQUIRE_SCALAR TSRMLS_CC);
}
/* }}} */
@@ -692,7 +692,7 @@
RETURN_FALSE;
}
- php_filter_array_handler(array_input, op, return_value);
+ php_filter_array_handler(array_input, op, return_value TSRMLS_CC);
}
/* }}} */
@@ -707,7 +707,7 @@
RETURN_FALSE;
}
- php_filter_array_handler(array_input, op, return_value);
+ php_filter_array_handler(array_input, op, return_value TSRMLS_CC);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
