summaryrefslogtreecommitdiff
path: root/ext/mbstring/mbstring.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mbstring/mbstring.c')
-rw-r--r--ext/mbstring/mbstring.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 516d401094..115af92fc2 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1393,7 +1393,7 @@ PHP_FUNCTION(mb_language)
zend_string *name = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S", &name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (name == NULL) {
RETVAL_STRING((char *)mbfl_no_language2name(MBSTRG(language)));
@@ -1419,7 +1419,7 @@ PHP_FUNCTION(mb_internal_encoding)
const mbfl_encoding *encoding;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &name, &name_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (name == NULL) {
name = MBSTRG(current_internal_encoding) ? MBSTRG(current_internal_encoding)->name: NULL;
@@ -1454,7 +1454,7 @@ PHP_FUNCTION(mb_http_input)
retname = 1;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &typ, &typ_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (typ == NULL) {
result = MBSTRG(http_input_identify);
@@ -1543,7 +1543,7 @@ PHP_FUNCTION(mb_http_output)
const mbfl_encoding *encoding;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &name, &name_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (name == NULL) {
@@ -1574,7 +1574,7 @@ PHP_FUNCTION(mb_detect_order)
zval *arg1 = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &arg1) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (!arg1) {
@@ -1651,7 +1651,7 @@ PHP_FUNCTION(mb_substitute_character)
zval *arg1 = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &arg1) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (!arg1) {
@@ -1711,7 +1711,7 @@ PHP_FUNCTION(mb_preferred_mime_name)
size_t name_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
- return;
+ RETURN_THROWS();
} else {
no_encoding = mbfl_name2no_encoding(name);
if (no_encoding == mbfl_no_encoding_invalid) {
@@ -1745,7 +1745,7 @@ PHP_FUNCTION(mb_parse_str)
track_vars_array = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &encstr, &encstr_len, &track_vars_array) == FAILURE) {
- return;
+ RETURN_THROWS();
}
track_vars_array = zend_try_array_init(track_vars_array);
@@ -1791,7 +1791,7 @@ PHP_FUNCTION(mb_output_handler)
char *s, *mimetype = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &arg_string, &arg_string_len, &arg_status) == FAILURE) {
- return;
+ RETURN_THROWS();
}
encoding = MBSTRG(current_http_output_encoding);
@@ -2090,7 +2090,7 @@ PHP_FUNCTION(mb_strpos)
size_t n;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|lS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &offset, &enc_name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2149,7 +2149,7 @@ PHP_FUNCTION(mb_strrpos)
zend_long offset = 0, n;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|lS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &offset, &enc_name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2186,7 +2186,7 @@ PHP_FUNCTION(mb_stripos)
zend_string *from_encoding = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|lS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &offset, &from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (needle.len == 0) {
@@ -2214,7 +2214,7 @@ PHP_FUNCTION(mb_strripos)
zend_string *from_encoding = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|lS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &offset, &from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
n = php_mb_stripos(1, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, offset, from_encoding);
@@ -2237,7 +2237,7 @@ PHP_FUNCTION(mb_strstr)
zend_bool part = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &part, &enc_name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2288,7 +2288,7 @@ PHP_FUNCTION(mb_strrchr)
zend_bool part = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &part, &enc_name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2341,7 +2341,7 @@ PHP_FUNCTION(mb_stristr)
zend_string *from_encoding = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &part, &from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2392,7 +2392,7 @@ PHP_FUNCTION(mb_strrichr)
zend_string *from_encoding = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|bS", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &part, &from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2437,7 +2437,7 @@ PHP_FUNCTION(mb_substr_count)
zend_string *enc_name = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|S", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &enc_name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
haystack.no_language = needle.no_language = MBSTRG(language);
@@ -2473,7 +2473,7 @@ PHP_FUNCTION(mb_substr)
mbfl_string string, result, *ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|l!S", &str, &str_len, &from, &len, &len_is_null, &encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
string.no_language = MBSTRG(language);
@@ -2536,7 +2536,7 @@ PHP_FUNCTION(mb_strcut)
mbfl_string string, result, *ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|l!S", (char **)&string.val, &string.len, &from, &len, &len_is_null, &encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
string.no_language = MBSTRG(language);
@@ -2593,7 +2593,7 @@ PHP_FUNCTION(mb_strwidth)
zend_string *enc_name = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|S", (char **)&string.val, &string.len, &enc_name) == FAILURE) {
- return;
+ RETURN_THROWS();
}
string.no_language = MBSTRG(language);
@@ -2622,7 +2622,7 @@ PHP_FUNCTION(mb_strimwidth)
mbfl_string string, result, marker, *ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sll|sS", &str, &str_len, &from, &width, &trimmarker, &trimmarker_len, &encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
string.no_language = marker.no_language = MBSTRG(language);
@@ -2873,7 +2873,7 @@ PHP_FUNCTION(mb_convert_encoding)
HashTable *target_hash;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zs|z", &input, &arg_new, &new_len, &arg_old) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (Z_TYPE_P(input) != IS_STRING && Z_TYPE_P(input) != IS_ARRAY) {
@@ -2971,7 +2971,7 @@ PHP_FUNCTION(mb_convert_case)
RETVAL_FALSE;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|S!", &str, &str_len,
&case_mode, &from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
enc = php_mb_get_encoding(from_encoding);
@@ -3008,7 +3008,7 @@ PHP_FUNCTION(mb_strtoupper)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|S!", &str, &str_len,
&from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
enc = php_mb_get_encoding(from_encoding);
@@ -3042,7 +3042,7 @@ PHP_FUNCTION(mb_strtolower)
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|S!", &str, &str_len,
&from_encoding) == FAILURE) {
- return;
+ RETURN_THROWS();
}
enc = php_mb_get_encoding(from_encoding);
@@ -3077,7 +3077,7 @@ PHP_FUNCTION(mb_detect_encoding)
size_t size;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z!b", &str, &str_len, &encoding_list, &strict) == FAILURE) {
- return;
+ RETURN_THROWS();
}
/* make encoding list */
@@ -3150,7 +3150,7 @@ PHP_FUNCTION(mb_list_encodings)
int i;
if (zend_parse_parameters_none() == FAILURE) {
- return;
+ RETURN_THROWS();
}
array_init(return_value);
@@ -3171,7 +3171,7 @@ PHP_FUNCTION(mb_encoding_aliases)
size_t name_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
encoding = mbfl_name2encoding(name);
@@ -3208,7 +3208,7 @@ PHP_FUNCTION(mb_encode_mimeheader)
string.encoding = MBSTRG(current_internal_encoding);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|sssl", (char **)&string.val, &string.len, &charset_name, &charset_name_len, &trans_enc_name, &trans_enc_name_len, &linefeed, &linefeed_len, &indent) == FAILURE) {
- return;
+ RETURN_THROWS();
}
charset = &mbfl_encoding_pass;
@@ -3258,7 +3258,7 @@ PHP_FUNCTION(mb_decode_mimeheader)
string.encoding = MBSTRG(current_internal_encoding);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", (char **)&string.val, &string.len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
mbfl_string_init(&result);
@@ -3284,7 +3284,7 @@ PHP_FUNCTION(mb_convert_kana)
zend_string *encname = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|sS", (char **)&string.val, &string.len, &optstr, &optstr_len, &encname) == FAILURE) {
- return;
+ RETURN_THROWS();
}
/* option */
@@ -3481,7 +3481,7 @@ PHP_FUNCTION(mb_convert_variables)
int recursion_error = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz+", &to_enc, &to_enc_len, &zfrom_enc, &args, &argc) == FAILURE) {
- return;
+ RETURN_THROWS();
}
/* new encoding */
@@ -3606,11 +3606,11 @@ php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
if (type == 0) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sh|sb", &str, &str_len, &target_hash, &encoding, &encoding_len, &is_hex) == FAILURE) {
- return;
+ RETURN_THROWS();
}
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sh|s", &str, &str_len, &target_hash, &encoding, &encoding_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
}
@@ -3913,7 +3913,7 @@ PHP_FUNCTION(mb_send_mail)
}
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss|zS", &to, &to_len, &subject, &subject_len, &message, &message_len, &headers, &extra_cmd) == FAILURE) {
- return;
+ RETURN_THROWS();
}
/* ASCIIZ check */
@@ -4162,7 +4162,7 @@ PHP_FUNCTION(mb_get_info)
const mbfl_encoding **entry;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &typ, &typ_len) == FAILURE) {
- return;
+ RETURN_THROWS();
}
if (!typ || !strcasecmp("all", typ)) {
@@ -4447,7 +4447,7 @@ PHP_FUNCTION(mb_check_encoding)
zend_string *enc = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|zS", &input, &enc) == FAILURE) {
- return;
+ RETURN_THROWS();
}
/* FIXME: Actually check all inputs, except $_FILES file content. */
View Lorry Controller Status