Remove unused 'from' field from mbfl_buffer_converter struct

diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c
index 813b5a6138c65b9c871a4f9d3154ba879f84a13d..755b06871c2c0b6bfd8982f23b541033903c227d 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfilter.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfilter.c
@@ -117,18 +117,17 @@ mbfl_buffer_converter_new(
     size_t buf_initsz)
 {
        mbfl_buffer_converter *convd = emalloc(sizeof(mbfl_buffer_converter));
-       convd->from = from;
        convd->to = to;
 
        /* create convert filter */
        convd->filter1 = NULL;
        convd->filter2 = NULL;
-       if (mbfl_convert_filter_get_vtbl(convd->from, convd->to) != NULL) {
-               convd->filter1 = mbfl_convert_filter_new(convd->from, convd->to, mbfl_memory_device_output, NULL, &convd->device);
+       if (mbfl_convert_filter_get_vtbl(from, to) != NULL) {
+               convd->filter1 = mbfl_convert_filter_new(from, to, mbfl_memory_device_output, NULL, &convd->device);
        } else {
-               convd->filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, convd->to, mbfl_memory_device_output, NULL, &convd->device);
+               convd->filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, to, mbfl_memory_device_output, NULL, &convd->device);
                if (convd->filter2 != NULL) {
-                       convd->filter1 = mbfl_convert_filter_new(convd->from,
+                       convd->filter1 = mbfl_convert_filter_new(from,
                                        &mbfl_encoding_wchar,
                                        (int (*)(int, void*))convd->filter2->filter_function,
                                        convd->filter2->filter_flush,

diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.h b/ext/mbstring/libmbfl/mbfl/mbfilter.h
index c57d0eac9faf298210fbf418e0238dddf92bb4fb..16742be96c3da15f5e7b11d835b0f61db91b0070 100644 (file)
--- a/ext/mbstring/libmbfl/mbfl/mbfilter.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfilter.h
@@ -137,7 +137,6 @@ struct _mbfl_buffer_converter {
        mbfl_convert_filter *filter1;
        mbfl_convert_filter *filter2;
        mbfl_memory_device device;
-       const mbfl_encoding *from;
        const mbfl_encoding *to;
 };