Skip to content

Commit a64241b

Browse files
alexdowadalexdowad
committed
Remove unused functions from mbstring
- mbfl_buffer_converter_reset - mbfl_buffer_converter_strncat - mbfl_buffer_converter_getbuffer - mbfl_oddlen - mbfl_filter_output_pipe_flush - mbfl_memory_device_output2 - mbfl_memory_device_output4 - mbfl_is_support_encoding - mbfl_buffer_converter_feed2 - _php_mb_regex_globals_dtor - mime_header_encoder_feed - mime_header_decoder_feed - mbfl_convert_filter_feed
1 parent 8d13348 commit a64241b

12 files changed

+8
-228
lines changed

‎ext/mbstring/libmbfl/mbfl/mbfilter.c

Lines changed: 6 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ mbfl_buffer_converter_delete(mbfl_buffer_converter *convd)
172172
}
173173
}
174174

175-
void
176-
mbfl_buffer_converter_reset(mbfl_buffer_converter *convd)
177-
{
178-
mbfl_memory_device_reset(&convd->device);
179-
}
180-
181175
int
182176
mbfl_buffer_converter_illegal_mode(mbfl_buffer_converter *convd, int mode)
183177
{
@@ -210,45 +204,16 @@ mbfl_buffer_converter_illegal_substchar(mbfl_buffer_converter *convd, int substc
210204
return 1;
211205
}
212206

213-
int
214-
mbfl_buffer_converter_strncat(mbfl_buffer_converter *convd, const unsigned char *p, size_t n)
215-
{
216-
mbfl_convert_filter *filter;
217-
int (*filter_function)(int c, mbfl_convert_filter *filter);
218-
219-
if (convd != NULL && p != NULL) {
220-
filter = convd->filter1;
221-
if (filter != NULL) {
222-
filter_function = filter->filter_function;
223-
while (n > 0) {
224-
if ((*filter_function)(*p++, filter) < 0) {
225-
break;
226-
}
227-
n--;
228-
}
229-
}
230-
}
231-
232-
return n;
233-
}
234-
235-
int
236-
mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string)
237-
{
238-
return mbfl_buffer_converter_feed2(convd, string, NULL);
239-
}
240-
241-
int
242-
mbfl_buffer_converter_feed2(mbfl_buffer_converter *convd, mbfl_string *string, size_t *loc)
207+
size_t mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string)
243208
{
244209
size_t n;
245210
unsigned char *p;
246211
mbfl_convert_filter *filter;
247212
int (*filter_function)(int c, mbfl_convert_filter *filter);
248213

249-
if (convd == NULL || string == NULL) {
250-
return -1;
251-
}
214+
ZEND_ASSERT(convd);
215+
ZEND_ASSERT(string);
216+
252217
mbfl_memory_device_realloc(&convd->device, convd->device.pos + string->len, string->len/4);
253218
/* feed data */
254219
n = string->len;
@@ -259,18 +224,12 @@ mbfl_buffer_converter_feed2(mbfl_buffer_converter *convd, mbfl_string *string, s
259224
filter_function = filter->filter_function;
260225
while (n > 0) {
261226
if ((*filter_function)(*p++, filter) < 0) {
262-
if (loc) {
263-
*loc = p - string->val;
264-
}
265-
return -1;
227+
return p - string->val;
266228
}
267229
n--;
268230
}
269231
}
270-
if (loc) {
271-
*loc = p - string->val;
272-
}
273-
return 0;
232+
return p - string->val;
274233
}
275234

276235

@@ -291,20 +250,6 @@ mbfl_buffer_converter_flush(mbfl_buffer_converter *convd)
291250
return 0;
292251
}
293252

294-
mbfl_string *
295-
mbfl_buffer_converter_getbuffer(mbfl_buffer_converter *convd, mbfl_string *result)
296-
{
297-
if (convd != NULL && result != NULL && convd->device.buffer != NULL) {
298-
result->encoding = convd->to;
299-
result->val = convd->device.buffer;
300-
result->len = convd->device.pos;
301-
} else {
302-
result = NULL;
303-
}
304-
305-
return result;
306-
}
307-
308253
mbfl_string *
309254
mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result)
310255
{
@@ -755,44 +700,6 @@ collector_strpos(int c, void* data)
755700
return c;
756701
}
757702

758-
/*
759-
* oddlen
760-
*/
761-
size_t
762-
mbfl_oddlen(mbfl_string *string)
763-
{
764-
size_t len, n, k;
765-
unsigned char *p;
766-
const mbfl_encoding *encoding = string->encoding;
767-
768-
len = 0;
769-
if (encoding->flag & MBFL_ENCTYPE_SBCS) {
770-
return 0;
771-
} else if (encoding->flag & (MBFL_ENCTYPE_WCS2BE | MBFL_ENCTYPE_WCS2LE)) {
772-
return len % 2;
773-
} else if (encoding->flag & (MBFL_ENCTYPE_WCS4BE | MBFL_ENCTYPE_WCS4LE)) {
774-
return len % 4;
775-
} else if (encoding->mblen_table != NULL) {
776-
const unsigned char *mbtab = encoding->mblen_table;
777-
n = 0;
778-
p = string->val;
779-
k = string->len;
780-
/* count */
781-
if (p != NULL) {
782-
while (n < k) {
783-
unsigned m = mbtab[*p];
784-
n += m;
785-
p += m;
786-
};
787-
}
788-
return n-k;
789-
} else {
790-
/* how can i do ? */
791-
return 0;
792-
}
793-
/* NOT REACHED */
794-
}
795-
796703
static const unsigned char *mbfl_find_offset_utf8(
797704
const unsigned char *str, const unsigned char *end, ssize_t offset) {
798705
if (offset < 0) {
@@ -2007,12 +1914,6 @@ mime_header_encoder_delete(struct mime_header_encoder_data *pe)
20071914
}
20081915
}
20091916

2010-
int
2011-
mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe)
2012-
{
2013-
return (*pe->conv1_filter->filter_function)(c, pe->conv1_filter);
2014-
}
2015-
20161917
mbfl_string *
20171918
mbfl_mime_header_encode(
20181919
mbfl_string *string,
@@ -2301,12 +2202,6 @@ mime_header_decoder_delete(struct mime_header_decoder_data *pd)
23012202
}
23022203
}
23032204

2304-
int
2305-
mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd)
2306-
{
2307-
return mime_header_decoder_collector(c, pd);
2308-
}
2309-
23102205
mbfl_string *
23112206
mbfl_mime_header_decode(
23122207
mbfl_string *string,

‎ext/mbstring/libmbfl/mbfl/mbfilter.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,10 @@ struct _mbfl_buffer_converter {
143143

144144
MBFLAPI extern mbfl_buffer_converter * mbfl_buffer_converter_new(const mbfl_encoding *from, const mbfl_encoding *to, size_t buf_initsz);
145145
MBFLAPI extern void mbfl_buffer_converter_delete(mbfl_buffer_converter *convd);
146-
MBFLAPI extern void mbfl_buffer_converter_reset(mbfl_buffer_converter *convd);
147146
MBFLAPI extern int mbfl_buffer_converter_illegal_mode(mbfl_buffer_converter *convd, int mode);
148147
MBFLAPI extern int mbfl_buffer_converter_illegal_substchar(mbfl_buffer_converter *convd, int substchar);
149-
MBFLAPI extern int mbfl_buffer_converter_strncat(mbfl_buffer_converter *convd, const unsigned char *p, size_t n);
150-
MBFLAPI extern int mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string);
151-
MBFLAPI extern int mbfl_buffer_converter_feed2(mbfl_buffer_converter *convd, mbfl_string *string, size_t *loc);
148+
MBFLAPI extern size_t mbfl_buffer_converter_feed(mbfl_buffer_converter *convd, mbfl_string *string);
152149
MBFLAPI extern int mbfl_buffer_converter_flush(mbfl_buffer_converter *convd);
153-
MBFLAPI extern mbfl_string * mbfl_buffer_converter_getbuffer(mbfl_buffer_converter *convd, mbfl_string *result);
154150
MBFLAPI extern mbfl_string * mbfl_buffer_converter_result(mbfl_buffer_converter *convd, mbfl_string *result);
155151
MBFLAPI extern mbfl_string * mbfl_buffer_converter_feed_result(mbfl_buffer_converter *convd, mbfl_string *string, mbfl_string *result);
156152
MBFLAPI extern size_t mbfl_buffer_illegalchars(mbfl_buffer_converter *convd);
@@ -196,12 +192,6 @@ static inline int mbfl_is_error(size_t len) {
196192
MBFLAPI extern size_t
197193
mbfl_strlen(const mbfl_string *string);
198194

199-
/*
200-
* oddlen
201-
*/
202-
MBFLAPI extern size_t
203-
mbfl_oddlen(mbfl_string *string);
204-
205195
#define MBFL_ERROR_NOT_FOUND ((size_t) -1)
206196
#define MBFL_ERROR_ENCODING ((size_t) -4)
207197
#define MBFL_ERROR_EMPTY ((size_t) -8)
@@ -263,9 +253,6 @@ mime_header_encoder_new(
263253
MBFLAPI extern void
264254
mime_header_encoder_delete(struct mime_header_encoder_data *pe);
265255

266-
MBFLAPI extern int
267-
mime_header_encoder_feed(int c, struct mime_header_encoder_data *pe);
268-
269256
MBFLAPI extern mbfl_string *
270257
mime_header_encoder_result(struct mime_header_encoder_data *pe, mbfl_string *result);
271258

@@ -288,9 +275,6 @@ mime_header_decoder_new(const mbfl_encoding *outcode);
288275
MBFLAPI extern void
289276
mime_header_decoder_delete(struct mime_header_decoder_data *pd);
290277

291-
MBFLAPI extern int
292-
mime_header_decoder_feed(int c, struct mime_header_decoder_data *pd);
293-
294278
MBFLAPI extern mbfl_string *
295279
mime_header_decoder_result(struct mime_header_decoder_data *pd, mbfl_string *result);
296280

‎ext/mbstring/libmbfl/mbfl/mbfl_convert.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,6 @@ mbfl_convert_filter_delete(mbfl_convert_filter *filter)
220220
}
221221
}
222222

223-
int
224-
mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter)
225-
{
226-
return (*filter->filter_function)(c, filter);
227-
}
228-
229223
int
230224
mbfl_convert_filter_feed_string(mbfl_convert_filter *filter, const unsigned char *p, size_t len) {
231225
while (len > 0) {

‎ext/mbstring/libmbfl/mbfl/mbfl_convert.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ MBFLAPI extern mbfl_convert_filter *mbfl_convert_filter_new2(
6868
int (*flush_function)(void *),
6969
void *data );
7070
MBFLAPI extern void mbfl_convert_filter_delete(mbfl_convert_filter *filter);
71-
MBFLAPI extern int mbfl_convert_filter_feed(int c, mbfl_convert_filter *filter);
7271
MBFLAPI extern int mbfl_convert_filter_feed_string(mbfl_convert_filter *filter, const unsigned char *p, size_t len);
7372
MBFLAPI extern int mbfl_convert_filter_flush(mbfl_convert_filter *filter);
7473
MBFLAPI extern void mbfl_convert_filter_reset(mbfl_convert_filter *filter, const mbfl_encoding *from, const mbfl_encoding *to);

‎ext/mbstring/libmbfl/mbfl/mbfl_encoding.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,3 @@ mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding)
308308
return NULL;
309309
}
310310
}
311-
312-
int
313-
mbfl_is_support_encoding(const char *name)
314-
{
315-
const mbfl_encoding *encoding;
316-
317-
encoding = mbfl_name2encoding(name);
318-
if (encoding == NULL) {
319-
return 0;
320-
} else {
321-
return 1;
322-
}
323-
}

‎ext/mbstring/libmbfl/mbfl/mbfl_encoding.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ MBFLAPI extern enum mbfl_no_encoding mbfl_name2no_encoding(const char *name);
158158
MBFLAPI extern const mbfl_encoding ** mbfl_get_supported_encodings();
159159
MBFLAPI extern const char * mbfl_no_encoding2name(enum mbfl_no_encoding no_encoding);
160160
MBFLAPI extern const char * mbfl_no2preferred_mime_name(enum mbfl_no_encoding no_encoding);
161-
MBFLAPI extern int mbfl_is_support_encoding(const char *name);
162161

163162

164163
#endif /* MBFL_ENCODING_H */

‎ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,6 @@ int mbfl_filter_output_pipe(int c, void* data)
4141
return (*filter->filter_function)(c, filter);
4242
}
4343

44-
int mbfl_filter_output_pipe_flush(void *data)
45-
{
46-
mbfl_convert_filter *filter = (mbfl_convert_filter*)data;
47-
if (filter->filter_flush != NULL) {
48-
return (*filter->filter_flush)(filter);
49-
}
50-
51-
return 0;
52-
}
53-
5444
int mbfl_filter_output_null(int c, void* data)
5545
{
5646
return c;

‎ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#define MBFL_FILTER_OUTPUT_H
3333

3434
MBFLAPI extern int mbfl_filter_output_pipe(int c, void* data);
35-
MBFLAPI extern int mbfl_filter_output_pipe_flush(void* data);
3635
MBFLAPI extern int mbfl_filter_output_null(int c, void* data);
3736

3837
#endif /* MBFL_FILTER_OUTPUT_H */

‎ext/mbstring/libmbfl/mbfl/mbfl_memory_device.c

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -150,58 +150,6 @@ mbfl_memory_device_output(int c, void *data)
150150
return c;
151151
}
152152

153-
int
154-
mbfl_memory_device_output2(int c, void *data)
155-
{
156-
mbfl_memory_device *device = (mbfl_memory_device *)data;
157-
158-
if (2 > device->length - device->pos) {
159-
/* reallocate buffer */
160-
size_t newlen;
161-
162-
if (device->length > SIZE_MAX - device->allocsz) {
163-
/* overflow */
164-
return -1;
165-
}
166-
167-
newlen = device->length + device->allocsz;
168-
device->buffer = erealloc(device->buffer, newlen);
169-
device->length = newlen;
170-
}
171-
172-
device->buffer[device->pos++] = (unsigned char)((c >> 8) & 0xff);
173-
device->buffer[device->pos++] = (unsigned char)(c & 0xff);
174-
175-
return c;
176-
}
177-
178-
int
179-
mbfl_memory_device_output4(int c, void* data)
180-
{
181-
mbfl_memory_device *device = (mbfl_memory_device *)data;
182-
183-
if (4 > device->length - device->pos) {
184-
/* reallocate buffer */
185-
size_t newlen;
186-
187-
if (device->length > SIZE_MAX - device->allocsz) {
188-
/* overflow */
189-
return -1;
190-
}
191-
192-
newlen = device->length + device->allocsz;
193-
device->buffer = erealloc(device->buffer, newlen);
194-
device->length = newlen;
195-
}
196-
197-
device->buffer[device->pos++] = (unsigned char)((c >> 24) & 0xff);
198-
device->buffer[device->pos++] = (unsigned char)((c >> 16) & 0xff);
199-
device->buffer[device->pos++] = (unsigned char)((c >> 8) & 0xff);
200-
device->buffer[device->pos++] = (unsigned char)(c & 0xff);
201-
202-
return c;
203-
}
204-
205153
int
206154
mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc)
207155
{

‎ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ MBFLAPI extern mbfl_string * mbfl_memory_device_result(
6060
mbfl_memory_device *device, mbfl_string *result);
6161
MBFLAPI extern void mbfl_memory_device_unput(mbfl_memory_device *device);
6262
MBFLAPI extern int mbfl_memory_device_output(int c, void *data);
63-
MBFLAPI extern int mbfl_memory_device_output2(int c, void *data);
64-
MBFLAPI extern int mbfl_memory_device_output4(int c, void *data);
6563
MBFLAPI extern int mbfl_memory_device_strcat(mbfl_memory_device *device, const char *psrc);
6664
MBFLAPI extern int mbfl_memory_device_strncat(
6765
mbfl_memory_device *device, const char *psrc, size_t len);

‎ext/mbstring/mbstring.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,6 @@ static size_t php_mb_zend_encoding_converter(unsigned char **to, size_t *to_leng
451451
{
452452
mbfl_string string, result;
453453
mbfl_buffer_converter *convd;
454-
int status;
455-
size_t loc;
456454

457455
/* new encoding */
458456
/* initialize string */
@@ -470,11 +468,7 @@ static size_t php_mb_zend_encoding_converter(unsigned char **to, size_t *to_leng
470468
mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar));
471469

472470
/* do it */
473-
status = mbfl_buffer_converter_feed2(convd, &string, &loc);
474-
if (status) {
475-
mbfl_buffer_converter_delete(convd);
476-
return (size_t)-1;
477-
}
471+
size_t loc = mbfl_buffer_converter_feed(convd, &string);
478472

479473
mbfl_buffer_converter_flush(convd);
480474
mbfl_string_init(&result);

0 commit comments

Comments
 (0)