diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-22 16:38:21 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-22 16:39:02 +0200 |
| commit | 3213e1e776a8d8fed34966b905671f306a9484a0 (patch) | |
| tree | 4643a755da324b1acd00a75d65d6744b16916312 /ext/tidy | |
| parent | 610b7a74fcb1d7d5c8803f9b6cf1a439b117fb41 (diff) | |
| download | php-git-3213e1e776a8d8fed34966b905671f306a9484a0.tar.gz | |
Just return on ZPP exception
No need to return FALSE.
Diffstat (limited to 'ext/tidy')
| -rw-r--r-- | ext/tidy/tidy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 2860c31752..c6b12be506 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -58,7 +58,7 @@ PHPTidyObj *obj; \ zval *object; \ if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, tidy_ce_doc) == FAILURE) { \ - RETURN_FALSE; \ + return; \ } \ obj = Z_TIDY_P(object); \ @@ -461,14 +461,14 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil zend_bool use_include_path = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|zsb", &arg1, &config, &enc, &enc_len, &use_include_path) == FAILURE) { - RETURN_FALSE; + return; } if (!(data = php_tidy_file_to_mem(ZSTR_VAL(arg1), use_include_path))) { RETURN_FALSE; } } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|zs", &arg1, &config, &enc, &enc_len) == FAILURE) { - RETURN_FALSE; + return; } data = arg1; } @@ -1110,7 +1110,7 @@ static PHP_FUNCTION(tidy_parse_string) PHPTidyObj *obj; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|zs", &input, &options, &enc, &enc_len) == FAILURE) { - RETURN_FALSE; + return; } if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(input))) { @@ -1173,7 +1173,7 @@ static PHP_FUNCTION(tidy_parse_file) if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|zsb", &inputfile, &options, &enc, &enc_len, &use_include_path) == FAILURE) { - RETURN_FALSE; + return; } tidy_instanciate(tidy_ce_doc, return_value); @@ -1275,7 +1275,7 @@ static PHP_FUNCTION(tidy_get_opt_doc) zval *object; if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) { - RETURN_FALSE; + return; } obj = Z_TIDY_P(object); @@ -1429,7 +1429,7 @@ static PHP_FUNCTION(tidy_getopt) zval *object; if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, tidy_ce_doc, &optname, &optname_len) == FAILURE) { - RETURN_FALSE; + return; } obj = Z_TIDY_P(object); @@ -1481,7 +1481,7 @@ static TIDY_DOC_METHOD(__construct) if (zend_parse_parameters(ZEND_NUM_ARGS(), "|Pzsb", &inputfile, &options, &enc, &enc_len, &use_include_path) == FAILURE) { - RETURN_FALSE; + return; } obj = Z_TIDY_P(object); @@ -1520,7 +1520,7 @@ static TIDY_DOC_METHOD(parseFile) if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|zsb", &inputfile, &options, &enc, &enc_len, &use_include_path) == FAILURE) { - RETURN_FALSE; + return; } if (!(contents = php_tidy_file_to_mem(ZSTR_VAL(inputfile), use_include_path))) { @@ -1555,7 +1555,7 @@ static TIDY_DOC_METHOD(parseString) TIDY_SET_CONTEXT; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|zs", &input, &options, &enc, &enc_len) == FAILURE) { - RETURN_FALSE; + return; } if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(input))) { |