From: Alex Dowad <alexinbeijing@gmail.com>
Date: Tue, 28 Jul 2020 21:30:16 +0000 (+0200)
Subject: Remove unused 'from' field from mbfl_buffer_converter struct
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec609916dcdef472750a7bc25f9998e3fae99123;p=php

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 813b5a6138..755b06871c 100644
--- 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 c57d0eac9f..16742be96c 100644
--- 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;
 };