- MFH: fix bug #30573 (compiler warning due to invalid type cast).

diff --git a/NEWS b/NEWS
index 314bf942365e8916eed5ab66292e49e472849ca9..b08a195c51e3b6d1ede9480e958392273108ac95 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,8 @@ PHP 4                                                                      NEWS
 - Fixed bug #31055 (apache2filter: per request leak proportional to the full
   path of the request URI). (kameshj at fastmail dot fm)
 - Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
+- Fixed bug #30573 (compiler warnings in libmbfl due to invalid type cast).
+  (Moriyoshi)
 - Fixed bug #30549 (incorrect character translations for some ISO8859
   charsets). (Moriyoshi)
 - Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
index 2eaa09cf7405346312b2ae7820ac6b41262679c4..40c24c3424e56ba389016175800e116eadd15709 100644 (file)
--- a/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
@@ -145,7 +145,7 @@ int mbfl_filt_conv_html_enc(int c, mbfl_convert_filter *filter)
 int mbfl_filt_conv_html_enc_flush(mbfl_convert_filter *filter)
 {
        filter->status = 0;
-       filter->cache = 0;
+       filter->opaque = NULL;
        return 0;
 }
 
@@ -158,24 +158,24 @@ static const char html_entity_chars[] = "#0123456789abcdefghijklmnopqrstuvwxyzAB
 void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter)
 {
        filter->status = 0;
-       filter->cache = (int)mbfl_malloc(html_enc_buffer_size+1);
+       filter->opaque = mbfl_malloc(html_enc_buffer_size+1);
 }
        
 void mbfl_filt_conv_html_dec_dtor(mbfl_convert_filter *filter)
 {
        filter->status = 0;
-       if (filter->cache)
+       if (filter->opaque)
        {
-               mbfl_free((void*)filter->cache);
+               mbfl_free((void*)filter->opaque);
        }
-       filter->cache = 0;
+       filter->opaque = NULL;
 }
 
 int mbfl_filt_conv_html_dec(int c, mbfl_convert_filter *filter)
 {
        int  pos, ent = 0;
        mbfl_html_entity_entry *entity;
-       char *buffer = (char*)filter->cache;
+       char *buffer = (char*)filter->opaque;
 
        if (!filter->status) {
                if (c == '&' ) {
@@ -246,7 +246,7 @@ int mbfl_filt_conv_html_dec_flush(mbfl_convert_filter *filter)
        int status, pos = 0;
        char *buffer;
 
-       buffer = (char*)filter->cache;
+       buffer = (char*)filter->opaque;
        status = filter->status;
        /* flush fragments */
        while (status--) {

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
index 0bc06209c178c83e211f950757e37f034358a4b7..afec8f06279eab9ef459f34880d5ff5bde6ba6bc 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
@@ -51,6 +51,7 @@ struct _mbfl_convert_filter {
        const mbfl_encoding *to;
        int illegal_mode;
        int illegal_substchar;
+       void *opaque;
 };
 
 struct mbfl_convert_vtbl {