MFH: fixed bug #22834 (compile failure due to ugly implicit casts)

diff --git a/ext/mbstring/mbfilter.c b/ext/mbstring/mbfilter.c
index 65f599aa952a317d97e2657fd18e940a11a3cf8e..37a5a9c008e16c2f2717cbbd4a097d993a49fde7 100644 (file)
--- a/ext/mbstring/mbfilter.c
+++ b/ext/mbstring/mbfilter.c
@@ -2954,7 +2954,7 @@ mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc TSRMLS_DC
        const unsigned char *p;
 
        len = 0;
-       p = psrc;
+       p = (const unsigned char *)psrc;
        while (*p) {
                p++;
                len++;
@@ -2971,7 +2971,7 @@ mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc TSRMLS_DC
                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 @@ retry:
                        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--;

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index f52dcdcecb3120f6636b681c18fa457b9c78aa3b..5cfc45326a81c52706cd1a21379823cae5169b49 100644 (file)
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -138,26 +138,26 @@ MBSTRING_API size_t php_mb_mbchar_bytes(const char *s TSRMLS_DC);
 
 
 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;

diff --git a/ext/standard/html.c b/ext/standard/html.c
index c94a209074077c009f85af7e9be25ddabde32f6e..eb96c5041f2f88ba335e821a3aaf501caca73f97 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -674,6 +674,8 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
 
                case mbfl_no_encoding_8859_5:
                        return cs_8859_5;
+
+               default:        
        }
 #else
        {