cvs: php4 /ext/mbstring mbfilter.c mbstring.h /ext/standard html.c

moriyoshi Mon Mar 24 16:22:23 2003 EDT Modified files: /php4/ext/mbstring mbfilter.c mbstring.h /php4/ext/standard html.c Log: Fixed bug #22834 (compile failure due to ugly implicit casts) Index: php4/ext/mbstring/mbfilter.c diff -u php4/ext/mbstring/mbfilter.c:1.53 php4/ext/mbstring/mbfilter.c:1.54 --- php4/ext/mbstring/mbfilter.c:1.53 Fri Jan 31 09:15:49 2003 +++ php4/ext/mbstring/mbfilter.c Mon Mar 24 16:22:22 2003 @@ -80,7 +80,7 @@ * */ -/* $Id: mbfilter.c,v 1.53 2003/01/31 14:15:49 moriyoshi Exp $ */ +/* $Id: mbfilter.c,v 1.54 2003/03/24 21:22:22 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -2954,7 +2954,7 @@ const unsigned char *p; len = 0; - p = psrc; + p = (const unsigned char *)psrc; while (*p) { p++; len++; @@ -2971,7 +2971,7 @@ device->buffer = tmp; } - p = psrc; + p = (const unsigned char *)psrc; w = &device->buffer[device->pos]; device->pos += len; while (len > 0) { @@ -7739,7 +7739,7 @@ for (;;) { pc->found_pos++; p = h; - m = pc->needle.buffer; + m = (int *)pc->needle.buffer; n = pc->needle_pos - 1; while (n > 0 && *p == *m) { n--; Index: php4/ext/mbstring/mbstring.h diff -u php4/ext/mbstring/mbstring.h:1.49 php4/ext/mbstring/mbstring.h:1.50 --- php4/ext/mbstring/mbstring.h:1.49 Tue Dec 31 11:06:53 2002 +++ php4/ext/mbstring/mbstring.h Mon Mar 24 16:22:23 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.h,v 1.49 2002/12/31 16:06:53 sebastian Exp $ */ +/* $Id: mbstring.h,v 1.50 2003/03/24 21:22:23 moriyoshi Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -138,26 +138,26 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring) - int language; - int current_language; - int internal_encoding; - int current_internal_encoding; + enum mbfl_no_language language; + enum mbfl_no_language current_language; + enum mbfl_no_encoding internal_encoding; + enum mbfl_no_encoding current_internal_encoding; #ifdef ZEND_MULTIBYTE - int *script_encoding_list; + enum mbfl_no_encoding *script_encoding_list; int script_encoding_list_size; #endif /* ZEND_MULTIBYTE */ - int http_output_encoding; - int current_http_output_encoding; - int http_input_identify; - int http_input_identify_get; - int http_input_identify_post; - int http_input_identify_cookie; - int http_input_identify_string; - int *http_input_list; + enum mbfl_no_encoding http_output_encoding; + enum mbfl_no_encoding current_http_output_encoding; + enum mbfl_no_encoding http_input_identify; + enum mbfl_no_encoding http_input_identify_get; + enum mbfl_no_encoding http_input_identify_post; + enum mbfl_no_encoding http_input_identify_cookie; + enum mbfl_no_encoding http_input_identify_string; + enum mbfl_no_encoding *http_input_list; int http_input_list_size; - int *detect_order_list; + enum mbfl_no_encoding *detect_order_list; int detect_order_list_size; - int *current_detect_order_list; + enum mbfl_no_encoding *current_detect_order_list; int current_detect_order_list_size; int filter_illegal_mode; int filter_illegal_substchar; Index: php4/ext/standard/html.c diff -u php4/ext/standard/html.c:1.76 php4/ext/standard/html.c:1.77 --- php4/ext/standard/html.c:1.76 Mon Mar 24 14:13:02 2003 +++ php4/ext/standard/html.c Mon Mar 24 16:22:23 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.76 2003/03/24 19:13:02 moriyoshi Exp $ */ +/* $Id: html.c,v 1.77 2003/03/24 21:22:23 moriyoshi Exp $ */ #include "php.h" #if PHP_WIN32 @@ -676,6 +676,8 @@ case mbfl_no_encoding_8859_5: return cs_8859_5; + + default: } #else {