Skip to content

Commit 363d87f

Browse files
GirgiasGirgias
committed
Fix [-Wmissing-field-initializers] compiler warning in mbstring
Add missing NULL pointer for mbfl_convert_vtbl struct.
1 parent a87bfdf commit 363d87f

Some content is hidden

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

65 files changed

+341
-166
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ const struct mbfl_convert_vtbl vtbl_8bit_7bit = {
5252
mbfl_filt_conv_common_ctor,
5353
mbfl_filt_conv_common_dtor,
5454
mbfl_filt_conv_any_7bit,
55-
mbfl_filt_conv_common_flush
55+
mbfl_filt_conv_common_flush,
56+
NULL,
5657
};
5758

5859
const struct mbfl_convert_vtbl vtbl_7bit_8bit = {
@@ -61,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_7bit_8bit = {
6162
mbfl_filt_conv_common_ctor,
6263
mbfl_filt_conv_common_dtor,
6364
mbfl_filt_conv_7bit_any,
64-
mbfl_filt_conv_common_flush
65+
mbfl_filt_conv_common_flush,
66+
NULL,
6567
};
6668

6769

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_armscii8 = {
6262
mbfl_filt_conv_common_ctor,
6363
mbfl_filt_conv_common_dtor,
6464
mbfl_filt_conv_wchar_armscii8,
65-
mbfl_filt_conv_common_flush
65+
mbfl_filt_conv_common_flush,
66+
NULL,
6667
};
6768

6869
const struct mbfl_convert_vtbl vtbl_armscii8_wchar = {
@@ -71,7 +72,8 @@ const struct mbfl_convert_vtbl vtbl_armscii8_wchar = {
7172
mbfl_filt_conv_common_ctor,
7273
mbfl_filt_conv_common_dtor,
7374
mbfl_filt_conv_armscii8_wchar,
74-
mbfl_filt_conv_common_flush
75+
mbfl_filt_conv_common_flush,
76+
NULL,
7577
};
7678

7779
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_ascii_wchar = {
6363
mbfl_filt_conv_common_ctor,
6464
mbfl_filt_conv_common_dtor,
6565
mbfl_filt_conv_ascii_wchar,
66-
mbfl_filt_conv_common_flush
66+
mbfl_filt_conv_common_flush,
67+
NULL,
6768
};
6869

6970
const struct mbfl_convert_vtbl vtbl_wchar_ascii = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_ascii = {
7273
mbfl_filt_conv_common_ctor,
7374
mbfl_filt_conv_common_dtor,
7475
mbfl_filt_conv_wchar_ascii,
75-
mbfl_filt_conv_common_flush
76+
mbfl_filt_conv_common_flush,
77+
NULL,
7678
};
7779

7880
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ const struct mbfl_convert_vtbl vtbl_8bit_b64 = {
5252
mbfl_filt_conv_common_ctor,
5353
mbfl_filt_conv_common_dtor,
5454
mbfl_filt_conv_base64enc,
55-
mbfl_filt_conv_base64enc_flush
55+
mbfl_filt_conv_base64enc_flush,
56+
NULL,
5657
};
5758

5859
const struct mbfl_convert_vtbl vtbl_b64_8bit = {
@@ -61,7 +62,8 @@ const struct mbfl_convert_vtbl vtbl_b64_8bit = {
6162
mbfl_filt_conv_common_ctor,
6263
mbfl_filt_conv_common_dtor,
6364
mbfl_filt_conv_base64dec,
64-
mbfl_filt_conv_base64dec_flush
65+
mbfl_filt_conv_base64dec_flush,
66+
NULL,
6567
};
6668

6769

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ const struct mbfl_convert_vtbl vtbl_big5_wchar = {
101101
mbfl_filt_conv_common_ctor,
102102
mbfl_filt_conv_common_dtor,
103103
mbfl_filt_conv_big5_wchar,
104-
mbfl_filt_conv_common_flush
104+
mbfl_filt_conv_common_flush,
105+
NULL,
105106
};
106107

107108
const struct mbfl_convert_vtbl vtbl_wchar_big5 = {
@@ -110,7 +111,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_big5 = {
110111
mbfl_filt_conv_common_ctor,
111112
mbfl_filt_conv_common_dtor,
112113
mbfl_filt_conv_wchar_big5,
113-
mbfl_filt_conv_common_flush
114+
mbfl_filt_conv_common_flush,
115+
NULL
114116
};
115117

116118
const struct mbfl_convert_vtbl vtbl_cp950_wchar = {
@@ -119,7 +121,8 @@ const struct mbfl_convert_vtbl vtbl_cp950_wchar = {
119121
mbfl_filt_conv_common_ctor,
120122
mbfl_filt_conv_common_dtor,
121123
mbfl_filt_conv_big5_wchar,
122-
mbfl_filt_conv_common_flush
124+
mbfl_filt_conv_common_flush,
125+
NULL,
123126
};
124127

125128
const struct mbfl_convert_vtbl vtbl_wchar_cp950 = {
@@ -128,7 +131,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp950 = {
128131
mbfl_filt_conv_common_ctor,
129132
mbfl_filt_conv_common_dtor,
130133
mbfl_filt_conv_wchar_big5,
131-
mbfl_filt_conv_common_flush
134+
mbfl_filt_conv_common_flush,
135+
NULL,
132136
};
133137

134138
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_byte2be_wchar = {
6363
mbfl_filt_conv_common_ctor,
6464
mbfl_filt_conv_common_dtor,
6565
mbfl_filt_conv_byte2be_wchar,
66-
mbfl_filt_conv_common_flush
66+
mbfl_filt_conv_common_flush,
67+
NULL,
6768
};
6869

6970
const struct mbfl_convert_vtbl vtbl_wchar_byte2be = {
@@ -72,23 +73,29 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte2be = {
7273
mbfl_filt_conv_common_ctor,
7374
mbfl_filt_conv_common_dtor,
7475
mbfl_filt_conv_wchar_byte2be,
75-
mbfl_filt_conv_common_flush };
76+
mbfl_filt_conv_common_flush,
77+
NULL,
78+
};
7679

7780
const struct mbfl_convert_vtbl vtbl_byte2le_wchar = {
7881
mbfl_no_encoding_byte2le,
7982
mbfl_no_encoding_wchar,
8083
mbfl_filt_conv_common_ctor,
8184
mbfl_filt_conv_common_dtor,
8285
mbfl_filt_conv_byte2le_wchar,
83-
mbfl_filt_conv_common_flush };
86+
mbfl_filt_conv_common_flush,
87+
NULL,
88+
};
8489

8590
const struct mbfl_convert_vtbl vtbl_wchar_byte2le = {
8691
mbfl_no_encoding_wchar,
8792
mbfl_no_encoding_byte2le,
8893
mbfl_filt_conv_common_ctor,
8994
mbfl_filt_conv_common_dtor,
9095
mbfl_filt_conv_wchar_byte2le,
91-
mbfl_filt_conv_common_flush };
96+
mbfl_filt_conv_common_flush,
97+
NULL,
98+
};
9299

93100
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)
94101

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_byte4be_wchar = {
6363
mbfl_filt_conv_common_ctor,
6464
mbfl_filt_conv_common_dtor,
6565
mbfl_filt_conv_byte4be_wchar,
66-
mbfl_filt_conv_common_flush
66+
mbfl_filt_conv_common_flush,
67+
NULL,
6768
};
6869

6970
const struct mbfl_convert_vtbl vtbl_wchar_byte4be = {
@@ -72,15 +73,18 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4be = {
7273
mbfl_filt_conv_common_ctor,
7374
mbfl_filt_conv_common_dtor,
7475
mbfl_filt_conv_wchar_byte4be,
75-
mbfl_filt_conv_common_flush };
76+
mbfl_filt_conv_common_flush,
77+
NULL,
78+
};
7679

7780
const struct mbfl_convert_vtbl vtbl_byte4le_wchar = {
7881
mbfl_no_encoding_byte4le,
7982
mbfl_no_encoding_wchar,
8083
mbfl_filt_conv_common_ctor,
8184
mbfl_filt_conv_common_dtor,
8285
mbfl_filt_conv_byte4le_wchar,
83-
mbfl_filt_conv_common_flush
86+
mbfl_filt_conv_common_flush,
87+
NULL,
8488
};
8589

8690
const struct mbfl_convert_vtbl vtbl_wchar_byte4le = {
@@ -89,7 +93,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_byte4le = {
8993
mbfl_filt_conv_common_ctor,
9094
mbfl_filt_conv_common_dtor,
9195
mbfl_filt_conv_wchar_byte4le,
92-
mbfl_filt_conv_common_flush
96+
mbfl_filt_conv_common_flush,
97+
NULL,
9398
};
9499

95100
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1251 = {
6363
mbfl_filt_conv_common_ctor,
6464
mbfl_filt_conv_common_dtor,
6565
mbfl_filt_conv_wchar_cp1251,
66-
mbfl_filt_conv_common_flush
66+
mbfl_filt_conv_common_flush,
67+
NULL,
6768
};
6869

6970
const struct mbfl_convert_vtbl vtbl_cp1251_wchar = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_cp1251_wchar = {
7273
mbfl_filt_conv_common_ctor,
7374
mbfl_filt_conv_common_dtor,
7475
mbfl_filt_conv_cp1251_wchar,
75-
mbfl_filt_conv_common_flush
76+
mbfl_filt_conv_common_flush,
77+
NULL,
7678
};
7779

7880
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_cp1252_wchar = {
6363
mbfl_filt_conv_common_ctor,
6464
mbfl_filt_conv_common_dtor,
6565
mbfl_filt_conv_cp1252_wchar,
66-
mbfl_filt_conv_common_flush
66+
mbfl_filt_conv_common_flush,
67+
NULL,
6768
};
6869

6970
const struct mbfl_convert_vtbl vtbl_wchar_cp1252 = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1252 = {
7273
mbfl_filt_conv_common_ctor,
7374
mbfl_filt_conv_common_dtor,
7475
mbfl_filt_conv_wchar_cp1252,
75-
mbfl_filt_conv_common_flush
76+
mbfl_filt_conv_common_flush,
77+
NULL,
7678
};
7779

7880
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const struct mbfl_convert_vtbl vtbl_cp1254_wchar = {
6363
mbfl_filt_conv_common_ctor,
6464
mbfl_filt_conv_common_dtor,
6565
mbfl_filt_conv_cp1254_wchar,
66-
mbfl_filt_conv_common_flush
66+
mbfl_filt_conv_common_flush,
67+
NULL,
6768
};
6869

6970
const struct mbfl_convert_vtbl vtbl_wchar_cp1254 = {
@@ -72,7 +73,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp1254 = {
7273
mbfl_filt_conv_common_ctor,
7374
mbfl_filt_conv_common_dtor,
7475
mbfl_filt_conv_wchar_cp1254,
75-
mbfl_filt_conv_common_flush
76+
mbfl_filt_conv_common_flush,
77+
NULL,
7678
};
7779

7880
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ const struct mbfl_convert_vtbl vtbl_jis_ms_wchar = {
145145
mbfl_filt_conv_common_dtor,
146146
mbfl_filt_conv_jis_ms_wchar,
147147
mbfl_filt_conv_common_flush,
148+
NULL,
148149
};
149150

150151
const struct mbfl_convert_vtbl vtbl_wchar_jis_ms = {
@@ -153,7 +154,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_jis_ms = {
153154
mbfl_filt_conv_common_ctor,
154155
mbfl_filt_conv_common_dtor,
155156
mbfl_filt_conv_wchar_jis_ms,
156-
mbfl_filt_conv_any_jis_flush
157+
mbfl_filt_conv_any_jis_flush,
158+
NULL,
157159
};
158160

159161
const struct mbfl_convert_vtbl vtbl_cp50220_wchar = {
@@ -162,7 +164,8 @@ const struct mbfl_convert_vtbl vtbl_cp50220_wchar = {
162164
mbfl_filt_conv_common_ctor,
163165
mbfl_filt_conv_common_dtor,
164166
mbfl_filt_conv_jis_ms_wchar,
165-
mbfl_filt_conv_common_flush
167+
mbfl_filt_conv_common_flush,
168+
NULL,
166169
};
167170

168171
const struct mbfl_convert_vtbl vtbl_wchar_cp50220 = {
@@ -181,7 +184,8 @@ const struct mbfl_convert_vtbl vtbl_cp50220raw_wchar = {
181184
mbfl_filt_conv_common_ctor,
182185
mbfl_filt_conv_common_dtor,
183186
mbfl_filt_conv_jis_ms_wchar,
184-
mbfl_filt_conv_common_flush
187+
mbfl_filt_conv_common_flush,
188+
NULL,
185189
};
186190

187191
const struct mbfl_convert_vtbl vtbl_wchar_cp50220raw = {
@@ -200,7 +204,8 @@ const struct mbfl_convert_vtbl vtbl_cp50221_wchar = {
200204
mbfl_filt_conv_common_ctor,
201205
mbfl_filt_conv_common_dtor,
202206
mbfl_filt_conv_jis_ms_wchar,
203-
mbfl_filt_conv_common_flush
207+
mbfl_filt_conv_common_flush,
208+
NULL,
204209
};
205210

206211
const struct mbfl_convert_vtbl vtbl_wchar_cp50221 = {
@@ -209,7 +214,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp50221 = {
209214
mbfl_filt_conv_common_ctor,
210215
mbfl_filt_conv_common_dtor,
211216
mbfl_filt_conv_wchar_cp50221,
212-
mbfl_filt_conv_any_jis_flush
217+
mbfl_filt_conv_any_jis_flush,
218+
NULL,
213219
};
214220

215221
const struct mbfl_convert_vtbl vtbl_cp50222_wchar = {
@@ -218,7 +224,8 @@ const struct mbfl_convert_vtbl vtbl_cp50222_wchar = {
218224
mbfl_filt_conv_common_ctor,
219225
mbfl_filt_conv_common_dtor,
220226
mbfl_filt_conv_jis_ms_wchar,
221-
mbfl_filt_conv_common_flush
227+
mbfl_filt_conv_common_flush,
228+
NULL,
222229
};
223230

224231
const struct mbfl_convert_vtbl vtbl_wchar_cp50222 = {
@@ -227,7 +234,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp50222 = {
227234
mbfl_filt_conv_common_ctor,
228235
mbfl_filt_conv_common_dtor,
229236
mbfl_filt_conv_wchar_cp50222,
230-
mbfl_filt_conv_wchar_cp50222_flush
237+
mbfl_filt_conv_wchar_cp50222_flush,
238+
NULL,
231239
};
232240

233241
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ const struct mbfl_convert_vtbl vtbl_cp51932_wchar = {
8686
mbfl_filt_conv_common_ctor,
8787
mbfl_filt_conv_common_dtor,
8888
mbfl_filt_conv_cp51932_wchar,
89-
mbfl_filt_conv_common_flush
89+
mbfl_filt_conv_common_flush,
90+
NULL,
9091
};
9192

9293
const struct mbfl_convert_vtbl vtbl_wchar_cp51932 = {
@@ -95,7 +96,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp51932 = {
9596
mbfl_filt_conv_common_ctor,
9697
mbfl_filt_conv_common_dtor,
9798
mbfl_filt_conv_wchar_cp51932,
98-
mbfl_filt_conv_common_flush
99+
mbfl_filt_conv_common_flush,
100+
NULL,
99101
};
100102

101103
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ const struct mbfl_convert_vtbl vtbl_wchar_cp850 = {
5959
mbfl_filt_conv_common_ctor,
6060
mbfl_filt_conv_common_dtor,
6161
mbfl_filt_conv_wchar_cp850,
62-
mbfl_filt_conv_common_flush
62+
mbfl_filt_conv_common_flush,
63+
NULL,
6364
};
6465

6566
const struct mbfl_convert_vtbl vtbl_cp850_wchar = {
@@ -68,7 +69,8 @@ const struct mbfl_convert_vtbl vtbl_cp850_wchar = {
6869
mbfl_filt_conv_common_ctor,
6970
mbfl_filt_conv_common_dtor,
7071
mbfl_filt_conv_cp850_wchar,
71-
mbfl_filt_conv_common_flush
72+
mbfl_filt_conv_common_flush,
73+
NULL,
7274
};
7375

7476
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)

0 commit comments

Comments
 (0)