Skip to content

Commit dcd6c60

Browse files
alexdowadalexdowad
committed
Remove unneeded function mbfl_filt_conv_common_dtor
This is a default destructor for mbfl_convert_filter structs. The thing is: there isn't really anything that needs to be done to those structs before freeing them. The default destructor just zeroed out some fields, but there's no reason why we should actually do that.
1 parent 409aa20 commit dcd6c60

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+214
-208
lines changed

‎ext/mbstring/libmbfl/filters/mbfilter_7bit.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const struct mbfl_convert_vtbl vtbl_8bit_7bit = {
4646
mbfl_no_encoding_8bit,
4747
mbfl_no_encoding_7bit,
4848
mbfl_filt_conv_common_ctor,
49-
mbfl_filt_conv_common_dtor,
49+
NULL,
5050
mbfl_filt_conv_any_7bit,
5151
mbfl_filt_conv_common_flush,
5252
NULL,
@@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_7bit_8bit = {
5656
mbfl_no_encoding_7bit,
5757
mbfl_no_encoding_8bit,
5858
mbfl_filt_conv_common_ctor,
59-
mbfl_filt_conv_common_dtor,
59+
NULL,
6060
mbfl_filt_conv_7bit_any,
6161
mbfl_filt_conv_common_flush,
6262
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_armscii8.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_armscii8 = {
5656
mbfl_no_encoding_wchar,
5757
mbfl_no_encoding_armscii8,
5858
mbfl_filt_conv_common_ctor,
59-
mbfl_filt_conv_common_dtor,
59+
NULL,
6060
mbfl_filt_conv_wchar_armscii8,
6161
mbfl_filt_conv_common_flush,
6262
NULL,
@@ -66,7 +66,7 @@ const struct mbfl_convert_vtbl vtbl_armscii8_wchar = {
6666
mbfl_no_encoding_armscii8,
6767
mbfl_no_encoding_wchar,
6868
mbfl_filt_conv_common_ctor,
69-
mbfl_filt_conv_common_dtor,
69+
NULL,
7070
mbfl_filt_conv_armscii8_wchar,
7171
mbfl_filt_conv_common_flush,
7272
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_ascii.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_ascii_wchar = {
5757
mbfl_no_encoding_ascii,
5858
mbfl_no_encoding_wchar,
5959
mbfl_filt_conv_common_ctor,
60-
mbfl_filt_conv_common_dtor,
60+
NULL,
6161
mbfl_filt_conv_ascii_wchar,
6262
mbfl_filt_conv_common_flush,
6363
NULL,
@@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_ascii = {
6767
mbfl_no_encoding_wchar,
6868
mbfl_no_encoding_ascii,
6969
mbfl_filt_conv_common_ctor,
70-
mbfl_filt_conv_common_dtor,
70+
NULL,
7171
mbfl_filt_conv_wchar_ascii,
7272
mbfl_filt_conv_common_flush,
7373
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_base64.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const struct mbfl_convert_vtbl vtbl_8bit_b64 = {
4646
mbfl_no_encoding_8bit,
4747
mbfl_no_encoding_base64,
4848
mbfl_filt_conv_common_ctor,
49-
mbfl_filt_conv_common_dtor,
49+
NULL,
5050
mbfl_filt_conv_base64enc,
5151
mbfl_filt_conv_base64enc_flush,
5252
NULL,
@@ -56,7 +56,7 @@ const struct mbfl_convert_vtbl vtbl_b64_8bit = {
5656
mbfl_no_encoding_base64,
5757
mbfl_no_encoding_8bit,
5858
mbfl_filt_conv_common_ctor,
59-
mbfl_filt_conv_common_dtor,
59+
NULL,
6060
mbfl_filt_conv_base64dec,
6161
mbfl_filt_conv_base64dec_flush,
6262
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_big5.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const struct mbfl_convert_vtbl vtbl_big5_wchar = {
9595
mbfl_no_encoding_big5,
9696
mbfl_no_encoding_wchar,
9797
mbfl_filt_conv_common_ctor,
98-
mbfl_filt_conv_common_dtor,
98+
NULL,
9999
mbfl_filt_conv_big5_wchar,
100100
mbfl_filt_conv_common_flush,
101101
NULL,
@@ -105,7 +105,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_big5 = {
105105
mbfl_no_encoding_wchar,
106106
mbfl_no_encoding_big5,
107107
mbfl_filt_conv_common_ctor,
108-
mbfl_filt_conv_common_dtor,
108+
NULL,
109109
mbfl_filt_conv_wchar_big5,
110110
mbfl_filt_conv_common_flush,
111111
NULL
@@ -115,7 +115,7 @@ const struct mbfl_convert_vtbl vtbl_cp950_wchar = {
115115
mbfl_no_encoding_cp950,
116116
mbfl_no_encoding_wchar,
117117
mbfl_filt_conv_common_ctor,
118-
mbfl_filt_conv_common_dtor,
118+
NULL,
119119
mbfl_filt_conv_big5_wchar,
120120
mbfl_filt_conv_common_flush,
121121
NULL,
@@ -125,7 +125,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp950 = {
125125
mbfl_no_encoding_wchar,
126126
mbfl_no_encoding_cp950,
127127
mbfl_filt_conv_common_ctor,
128-
mbfl_filt_conv_common_dtor,
128+
NULL,
129129
mbfl_filt_conv_wchar_big5,
130130
mbfl_filt_conv_common_flush,
131131
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_byte2.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_byte2be_wchar = {
5757
mbfl_no_encoding_byte2be,
5858
mbfl_no_encoding_wchar,
5959
mbfl_filt_conv_common_ctor,
60-
mbfl_filt_conv_common_dtor,
60+
NULL,
6161
mbfl_filt_conv_byte2be_wchar,
6262
mbfl_filt_conv_common_flush,
6363
NULL,
@@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2be = {
6767
mbfl_no_encoding_wchar,
6868
mbfl_no_encoding_byte2be,
6969
mbfl_filt_conv_common_ctor,
70-
mbfl_filt_conv_common_dtor,
70+
NULL,
7171
mbfl_filt_conv_wchar_byte2be,
7272
mbfl_filt_conv_common_flush,
7373
NULL,
@@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_byte2le_wchar = {
7777
mbfl_no_encoding_byte2le,
7878
mbfl_no_encoding_wchar,
7979
mbfl_filt_conv_common_ctor,
80-
mbfl_filt_conv_common_dtor,
80+
NULL,
8181
mbfl_filt_conv_byte2le_wchar,
8282
mbfl_filt_conv_common_flush,
8383
NULL,
@@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2le = {
8787
mbfl_no_encoding_wchar,
8888
mbfl_no_encoding_byte2le,
8989
mbfl_filt_conv_common_ctor,
90-
mbfl_filt_conv_common_dtor,
90+
NULL,
9191
mbfl_filt_conv_wchar_byte2le,
9292
mbfl_filt_conv_common_flush,
9393
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_byte4.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_byte4be_wchar = {
5757
mbfl_no_encoding_byte4be,
5858
mbfl_no_encoding_wchar,
5959
mbfl_filt_conv_common_ctor,
60-
mbfl_filt_conv_common_dtor,
60+
NULL,
6161
mbfl_filt_conv_byte4be_wchar,
6262
mbfl_filt_conv_common_flush,
6363
NULL,
@@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4be = {
6767
mbfl_no_encoding_wchar,
6868
mbfl_no_encoding_byte4be,
6969
mbfl_filt_conv_common_ctor,
70-
mbfl_filt_conv_common_dtor,
70+
NULL,
7171
mbfl_filt_conv_wchar_byte4be,
7272
mbfl_filt_conv_common_flush,
7373
NULL,
@@ -77,7 +77,7 @@ const struct mbfl_convert_vtbl vtbl_byte4le_wchar = {
7777
mbfl_no_encoding_byte4le,
7878
mbfl_no_encoding_wchar,
7979
mbfl_filt_conv_common_ctor,
80-
mbfl_filt_conv_common_dtor,
80+
NULL,
8181
mbfl_filt_conv_byte4le_wchar,
8282
mbfl_filt_conv_common_flush,
8383
NULL,
@@ -87,7 +87,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4le = {
8787
mbfl_no_encoding_wchar,
8888
mbfl_no_encoding_byte4le,
8989
mbfl_filt_conv_common_ctor,
90-
mbfl_filt_conv_common_dtor,
90+
NULL,
9191
mbfl_filt_conv_wchar_byte4le,
9292
mbfl_filt_conv_common_flush,
9393
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_cp1251.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1251 = {
5757
mbfl_no_encoding_wchar,
5858
mbfl_no_encoding_cp1251,
5959
mbfl_filt_conv_common_ctor,
60-
mbfl_filt_conv_common_dtor,
60+
NULL,
6161
mbfl_filt_conv_wchar_cp1251,
6262
mbfl_filt_conv_common_flush,
6363
NULL,
@@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_cp1251_wchar = {
6767
mbfl_no_encoding_cp1251,
6868
mbfl_no_encoding_wchar,
6969
mbfl_filt_conv_common_ctor,
70-
mbfl_filt_conv_common_dtor,
70+
NULL,
7171
mbfl_filt_conv_cp1251_wchar,
7272
mbfl_filt_conv_common_flush,
7373
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_cp1252.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_cp1252_wchar = {
5757
mbfl_no_encoding_cp1252,
5858
mbfl_no_encoding_wchar,
5959
mbfl_filt_conv_common_ctor,
60-
mbfl_filt_conv_common_dtor,
60+
NULL,
6161
mbfl_filt_conv_cp1252_wchar,
6262
mbfl_filt_conv_common_flush,
6363
NULL,
@@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1252 = {
6767
mbfl_no_encoding_wchar,
6868
mbfl_no_encoding_cp1252,
6969
mbfl_filt_conv_common_ctor,
70-
mbfl_filt_conv_common_dtor,
70+
NULL,
7171
mbfl_filt_conv_wchar_cp1252,
7272
mbfl_filt_conv_common_flush,
7373
NULL,

‎ext/mbstring/libmbfl/filters/mbfilter_cp1254.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const struct mbfl_convert_vtbl vtbl_cp1254_wchar = {
5757
mbfl_no_encoding_cp1254,
5858
mbfl_no_encoding_wchar,
5959
mbfl_filt_conv_common_ctor,
60-
mbfl_filt_conv_common_dtor,
60+
NULL,
6161
mbfl_filt_conv_cp1254_wchar,
6262
mbfl_filt_conv_common_flush,
6363
NULL,
@@ -67,7 +67,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1254 = {
6767
mbfl_no_encoding_wchar,
6868
mbfl_no_encoding_cp1254,
6969
mbfl_filt_conv_common_ctor,
70-
mbfl_filt_conv_common_dtor,
70+
NULL,
7171
mbfl_filt_conv_wchar_cp1254,
7272
mbfl_filt_conv_common_flush,
7373
NULL,

0 commit comments

Comments
 (0)