[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c

[Pierre-Alain Joye]

pajoye          Mon Dec  4 21:16:01 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/filter filter.c 
  Log:
  - default filter is not string anymore (in comment)
  - WS and error msg sync with head
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.30&r2=1.52.2.31&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.30 
php-src/ext/filter/filter.c:1.52.2.31
--- php-src/ext/filter/filter.c:1.52.2.30       Mon Dec  4 21:07:13 2006
+++ php-src/ext/filter/filter.c Mon Dec  4 21:16:01 2006
@@ -19,7 +19,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: filter.c,v 1.52.2.30 2006/12/04 21:07:13 pajoye Exp $ */
+/* $Id: filter.c,v 1.52.2.31 2006/12/04 21:16:01 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -123,7 +123,7 @@
                        return SUCCESS;
                }
        }
-       /* Fallback to "string" filter */
+       /* Fallback to the default filter */
        IF_G(default_filter) = FILTER_DEFAULT;
        return SUCCESS;
 }
@@ -170,9 +170,9 @@
        REGISTER_INI_ENTRIES();
 
        REGISTER_LONG_CONSTANT("INPUT_POST",    PARSE_POST,     CONST_CS | 
CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("INPUT_GET",     PARSE_GET,      CONST_CS | 
CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("INPUT_GET",             PARSE_GET,              
CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("INPUT_COOKIE",  PARSE_COOKIE,   CONST_CS | 
CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("INPUT_ENV",     PARSE_ENV,      CONST_CS | 
CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("INPUT_ENV",             PARSE_ENV,              
CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("INPUT_SERVER",  PARSE_SERVER,   CONST_CS | 
CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("INPUT_SESSION", PARSE_SESSION,  CONST_CS | 
CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("INPUT_REQUEST", PARSE_REQUEST,  CONST_CS | 
CONST_PERSISTENT);
@@ -274,8 +274,8 @@
 PHP_MINFO_FUNCTION(filter)
 {
        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.30 $");
+       php_info_print_table_row( 2, "Input Validation and Filtering", 
"enabled" );
+       php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.31 $");
        php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();
@@ -638,10 +638,10 @@
                zend_hash_internal_pointer_reset(Z_ARRVAL_PP(op));
                for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(op), &pos);
                        zend_hash_get_current_data_ex(Z_ARRVAL_PP(op), (void 
**) &arg_elm, &pos) == SUCCESS;
-                       zend_hash_move_forward_ex(Z_ARRVAL_PP(op), &pos)) 
+                       zend_hash_move_forward_ex(Z_ARRVAL_PP(op), &pos))
                {
                        if (zend_hash_get_current_key_ex(Z_ARRVAL_PP(op), 
&arg_key, &arg_key_len, &index, 0, &pos) != HASH_KEY_IS_STRING) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Numeric keys are not allowed in the definition array.");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Numeric keys are not allowed in the definition array");
                                zval_dtor(return_value);
                                RETURN_FALSE;
                        }
@@ -791,7 +791,7 @@
        int i, size = sizeof(filter_list) / sizeof(filter_list_entry);
 
        if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;              
+               WRONG_PARAM_COUNT;
        }
 
        array_init(return_value);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php