mbfl_strwidth does not need to use legacy conversion filters now

...Because we have the new (faster) conversion filters now for
ALL text encodings supported by mbstring.

Author: alexdowad

ext/mbstring/libmbfl/mbfl/mbfilter.c

@@ -1216,47 +1216,26 @@ static size_t character_width(unsigned int c)
 	return 1;
 }
 
-static int filter_count_width(int c, void* data)
-{
-	(*(size_t *)data) += character_width(c);
-	return 0;
-}
-
 size_t mbfl_strwidth(mbfl_string *string)
 {
 	if (!string->len) {
 		return 0;
 	}
 
 	size_t width = 0;
-
-	if (string->encoding->to_wchar) {
-		uint32_t wchar_buf[128];
-		unsigned char *in = string->val;
-		size_t in_len = string->len;
-		unsigned int state = 0;
-
-		while (in_len) {
-			size_t out_len = string->encoding->to_wchar(&in, &in_len, wchar_buf, 128, &state);
-			while (out_len) {
-				/* NOTE: 'bad input' marker will be counted as 1 unit of width
-				 * If text conversion is performed with an ordinary ASCII character as
-				 * the 'replacement character', this will give us the correct display width. */
-				width += character_width(wchar_buf[--out_len]);
-			}
+	uint32_t wchar_buf[128];
+	unsigned char *in = string->val;
+	size_t in_len = string->len;
+	unsigned int state = 0;
+
+	while (in_len) {
+		size_t out_len = string->encoding->to_wchar(&in, &in_len, wchar_buf, 128, &state);
+		while (out_len) {
+			/* NOTE: 'bad input' marker will be counted as 1 unit of width
+			 * If text conversion is performed with an ordinary ASCII character as
+			 * the 'replacement character', this will give us the correct display width. */
+			width += character_width(wchar_buf[--out_len]);
 		}
-	} else {
-		mbfl_convert_filter *filter = mbfl_convert_filter_new(string->encoding, &mbfl_encoding_wchar, filter_count_width, 0, &width);
-		ZEND_ASSERT(filter);
-
-		/* feed data */
-		unsigned char *p = string->val, *e = p + string->len;
-		while (p < e) {
-			(*filter->filter_function)(*p++, filter);
-		}
-
-		mbfl_convert_filter_flush(filter);
-		mbfl_convert_filter_delete(filter);
 	}
 
 	return width;