cvs: php-src(PHP_5_2) /ext/filter filter.c logical_filters.c sanitizing_filters.c

tony2001 Wed Jul 19 06:57:21 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/filter filter.c logical_filters.c sanitizing_filters.c Log: fix compile warnings http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52&r2=1.52.2.1&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52 php-src/ext/filter/filter.c:1.52.2.1 --- php-src/ext/filter/filter.c:1.52 Thu Jun 22 10:58:13 2006 +++ php-src/ext/filter/filter.c Wed Jul 19 06:57:21 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filter.c,v 1.52 2006/06/22 10:58:13 pajoye Exp $ */ +/* $Id: filter.c,v 1.52.2.1 2006/07/19 06:57:21 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -274,7 +274,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.52 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.1 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -323,7 +323,7 @@ { zval new_var, raw_var; zval *array_ptr = NULL, *orig_array_ptr = NULL; - char *orig_var; + char *orig_var = NULL; int retval = 0; assert(*val != NULL); http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1&r2=1.1.2.1&diff_format=u Index: php-src/ext/filter/logical_filters.c diff -u php-src/ext/filter/logical_filters.c:1.1 php-src/ext/filter/logical_filters.c:1.1.2.1 --- php-src/ext/filter/logical_filters.c:1.1 Thu Jun 15 22:20:57 2006 +++ php-src/ext/filter/logical_filters.c Wed Jul 19 06:57:21 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: logical_filters.c,v 1.1 2006/06/15 22:20:57 pajoye Exp $ */ +/* $Id: logical_filters.c,v 1.1.2.1 2006/07/19 06:57:21 tony2001 Exp $ */ #include "php_filter.h" #include "filter_private.h" @@ -41,6 +41,7 @@ #define FETCH_STRING_OPTION(var_name, option_name) \ var_name = NULL; \ var_name##_set = 0; \ + var_name##_len = 0; \ if (option_array) { \ if (zend_hash_find(HASH_OF(option_array), option_name, sizeof(option_name), (void **) &option_val) == SUCCESS) { \ convert_to_string(*option_val); \ @@ -248,7 +249,7 @@ zval **option_val; char *decimal; - char dec_sep; + char dec_sep = '\0'; const char default_decimal[] = "."; int decimal_set, decimal_len; @@ -260,7 +261,7 @@ int sign = 1; - double ret_val; + double ret_val = 0; double factor; int exp_value = 0, exp_multiply = 1; http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.11&r2=1.11.2.1&diff_format=u Index: php-src/ext/filter/sanitizing_filters.c diff -u php-src/ext/filter/sanitizing_filters.c:1.11 php-src/ext/filter/sanitizing_filters.c:1.11.2.1 --- php-src/ext/filter/sanitizing_filters.c:1.11 Sun Jan 29 16:37:42 2006 +++ php-src/ext/filter/sanitizing_filters.c Wed Jul 19 06:57:21 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sanitizing_filters.c,v 1.11 2006/01/29 16:37:42 derick Exp $ */ +/* $Id: sanitizing_filters.c,v 1.11.2.1 2006/07/19 06:57:21 tony2001 Exp $ */ #include "php_filter.h" #include "filter_private.h" @@ -67,7 +67,7 @@ for (x = 0, y = 0; len--; x++, y++) { if (((flags & FILTER_FLAG_ENCODE_LOW) && (s[x] < 32)) || ((flags & FILTER_FLAG_ENCODE_HIGH) && (s[x] > 127))) { smart_str_appendl(&str, "&#", 2); - smart_str_append_long(&str, s[x]); + smart_str_append_unsigned(&str, s[x]); smart_str_appendc(&str, ';'); } else { smart_str_appendc(&str, s[x]);