diff options
Diffstat (limited to 'ext/mbstring/libmbfl/mbfl/mbfl_string.c')
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_string.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index b1acecb259..fc9f211092 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -44,33 +44,25 @@ void mbfl_string_init(mbfl_string *string) { - if (string) { - string->no_language = mbfl_no_language_uni; - string->encoding = &mbfl_encoding_pass; - string->val = (unsigned char*)NULL; - string->len = 0; - } + string->encoding = &mbfl_encoding_pass; + string->val = (unsigned char*)NULL; + string->len = 0; } void -mbfl_string_init_set(mbfl_string *string, mbfl_language_id no_language, const mbfl_encoding *encoding) +mbfl_string_init_set(mbfl_string *string, const mbfl_encoding *encoding) { - if (string) { - string->no_language = no_language; - string->encoding = encoding; - string->val = (unsigned char*)NULL; - string->len = 0; - } + string->encoding = encoding; + string->val = (unsigned char*)NULL; + string->len = 0; } void mbfl_string_clear(mbfl_string *string) { - if (string) { - if (string->val != (unsigned char*)NULL) { - mbfl_free(string->val); - } - string->val = (unsigned char*)NULL; - string->len = 0; + if (string->val != (unsigned char*)NULL) { + mbfl_free(string->val); } + string->val = (unsigned char*)NULL; + string->len = 0; } |