pajoye Tue Oct 3 11:42:23 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c sanitizing_filters.c
Log:
- vi folding, ws
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.19&r2=1.52.2.20&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.19
php-src/ext/filter/filter.c:1.52.2.20
--- php-src/ext/filter/filter.c:1.52.2.19 Tue Oct 3 05:57:52 2006
+++ php-src/ext/filter/filter.c Tue Oct 3 11:42:23 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.19 2006/10/03 05:57:52 mike Exp $ */
+/* $Id: filter.c,v 1.52.2.20 2006/10/03 11:42:23 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
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_row( 2, "Revision", "$Revision: 1.52.2.20 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -443,8 +443,8 @@
}
/* }}} */
-/* {{{ */
-static zval *php_filter_get_storage(long arg TSRMLS_DC)
+static zval *php_filter_get_storage(long arg TSRMLS_DC)/* {{{ */
+
{
zval *array_ptr = NULL;
zend_bool jit_initialization = (PG(auto_globals_jit) &&
!PG(register_globals) && !PG(register_long_arrays));
@@ -510,8 +510,7 @@
}
/* }}} */
-
-static void php_filter_call(zval **filtered, long filter, zval **filter_args,
const int copy, long filter_flags TSRMLS_DC)
+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;
@@ -579,8 +578,9 @@
*filtered = temp_array;
}
}
+/* }}} */
-static void php_filter_array_handler(zval *input, zval **op, zval
*return_value TSRMLS_DC)
+static void php_filter_array_handler(zval *input, zval **op, zval
*return_value TSRMLS_DC) /* {{{ */
{
char *arg_key;
uint arg_key_len;
@@ -627,7 +627,7 @@
RETURN_FALSE;
}
}
-
+/* }}} */
/* {{{ proto mixed filter_input(constant type, string variable_name [, long
filter [, mixed options]])
* Returns the filtered variable 'name'* from source `type`.
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.11.2.4&r2=1.11.2.5&diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.11.2.4
php-src/ext/filter/sanitizing_filters.c:1.11.2.5
--- php-src/ext/filter/sanitizing_filters.c:1.11.2.4 Sat Jul 22 12:59:15 2006
+++ php-src/ext/filter/sanitizing_filters.c Tue Oct 3 11:42:23 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sanitizing_filters.c,v 1.11.2.4 2006/07/22 12:59:15 pajoye Exp $ */
+/* $Id: sanitizing_filters.c,v 1.11.2.5 2006/10/03 11:42:23 pajoye Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -177,7 +177,6 @@
}
/* }}} */
-
/* {{{ php_filter_string */
void php_filter_string(PHP_INPUT_FILTER_PARAM_DECL)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
