]> granicus.if.org Git - php/commitdiff
Avoid compiler warnings related to mbstring flush functions
authorAlex Dowad <alexinbeijing@gmail.com>
Sat, 19 Sep 2020 15:54:25 +0000 (17:54 +0200)
committerAlex Dowad <alexinbeijing@gmail.com>
Tue, 13 Oct 2020 04:12:37 +0000 (06:12 +0200)
ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c
ext/mbstring/libmbfl/mbfl/mbfl_convert.c

index 3879f9eb5bba06c8ad97a0a9e36c47152cb160c4..c58f0a6c4f7f6cfff82348521fabb9fdc3ebfb1e 100644 (file)
@@ -585,7 +585,7 @@ mbfl_filt_conv_wchar_cp50220_ctor(mbfl_convert_filter *filt)
        ctx->last.opaque = ctx;
        ctx->last.data = filt->data;
        filt->filter_function = vtbl_tl_jisx0201_jisx0208.filter_function;
-       filt->filter_flush = vtbl_tl_jisx0201_jisx0208.filter_flush;
+       filt->filter_flush = (filter_flush_t)vtbl_tl_jisx0201_jisx0208.filter_flush;
        filt->output_function = (output_function_t)ctx->last.filter_function;
        filt->flush_function = (flush_function_t)ctx->last.filter_flush;
        filt->data = &ctx->last;
index 6a46c2b541a1fa4b4b28b43705e148a33e924d8f..af6a3bba93bdb36be4ebd9252ae5e31d33f6b004 100644 (file)
@@ -136,7 +136,7 @@ static void mbfl_convert_filter_common_init(mbfl_convert_filter *filter, const m
        filter->filter_ctor = vtbl->filter_ctor;
        filter->filter_dtor = vtbl->filter_dtor;
        filter->filter_function = vtbl->filter_function;
-       filter->filter_flush = vtbl->filter_flush;
+       filter->filter_flush = (filter_flush_t)vtbl->filter_flush;
        filter->filter_copy = vtbl->filter_copy;
 
        (*filter->filter_ctor)(filter);