Skip to content

Commit ec60991

Browse files
committed
Remove unused 'from' field from mbfl_buffer_converter struct
1 parent f699d65 commit ec60991

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

ext/mbstring/libmbfl/mbfl/mbfilter.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,17 @@ mbfl_buffer_converter_new(
117117
size_t buf_initsz)
118118
{
119119
mbfl_buffer_converter *convd = emalloc(sizeof(mbfl_buffer_converter));
120-
convd->from = from;
121120
convd->to = to;
122121

123122
/* create convert filter */
124123
convd->filter1 = NULL;
125124
convd->filter2 = NULL;
126-
if (mbfl_convert_filter_get_vtbl(convd->from, convd->to) != NULL) {
127-
convd->filter1 = mbfl_convert_filter_new(convd->from, convd->to, mbfl_memory_device_output, NULL, &convd->device);
125+
if (mbfl_convert_filter_get_vtbl(from, to) != NULL) {
126+
convd->filter1 = mbfl_convert_filter_new(from, to, mbfl_memory_device_output, NULL, &convd->device);
128127
} else {
129-
convd->filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, convd->to, mbfl_memory_device_output, NULL, &convd->device);
128+
convd->filter2 = mbfl_convert_filter_new(&mbfl_encoding_wchar, to, mbfl_memory_device_output, NULL, &convd->device);
130129
if (convd->filter2 != NULL) {
131-
convd->filter1 = mbfl_convert_filter_new(convd->from,
130+
convd->filter1 = mbfl_convert_filter_new(from,
132131
&mbfl_encoding_wchar,
133132
(int (*)(int, void*))convd->filter2->filter_function,
134133
convd->filter2->filter_flush,

ext/mbstring/libmbfl/mbfl/mbfilter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ struct _mbfl_buffer_converter {
137137
mbfl_convert_filter *filter1;
138138
mbfl_convert_filter *filter2;
139139
mbfl_memory_device device;
140-
const mbfl_encoding *from;
141140
const mbfl_encoding *to;
142141
};
143142

0 commit comments

Comments
 (0)