moriyoshi Mon Feb 21 05:13:22 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/mbstring/libmbfl/filters mbfilter_htmlent.c /php-src/ext/mbstring/libmbfl/mbfl mbfl_convert.h Log: - MFH: fix bug #30573 (compiler warning due to invalid type cast). http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c?r1=1.5.2.1&r2=1.5.2.2&ty=u Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.1 php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.2 --- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.1 Mon Jan 10 06:30:01 2005 +++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Mon Feb 21 05:13:22 2005 @@ -145,7 +145,7 @@ 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 @@ 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 status, pos = 0; char *buffer; - buffer = (char*)filter->cache; + buffer = (char*)filter->opaque; status = filter->status; /* flush fragments */ while (status--) { http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3 php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3.2.1 --- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3 Wed Feb 4 02:24:07 2004 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h Mon Feb 21 05:13:22 2005 @@ -51,6 +51,7 @@ const mbfl_encoding *to; int illegal_mode; int illegal_substchar; + void *opaque; }; struct mbfl_convert_vtbl {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php