From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 15 Aug 2019 15:19:52 +0000 (+0200)
Subject: Don't explicitly set return value on ZPP failure
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f49b1df507787833cef12b63c2fcd022453c19e;p=php

Don't explicitly set return value on ZPP failure

Failing ZPP throws as of PHP 8.0.0, so explicitly setting a return
value is useless, and also slightly confusing.
---

diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 70cf0fe28d..38b3e43a5f 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -321,7 +321,7 @@ PHP_FUNCTION(enchant_broker_free)
 	enchant_broker *pbroker;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &broker) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 	PHP_ENCHANT_GET_BROKER;
 
@@ -339,7 +339,7 @@ PHP_FUNCTION(enchant_broker_get_error)
 	char *msg;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &broker) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -364,7 +364,7 @@ PHP_FUNCTION(enchant_broker_set_dict_path)
 	size_t value_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rls", &broker, &dict_type, &value, &value_len) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (!value_len) {
@@ -403,7 +403,7 @@ PHP_FUNCTION(enchant_broker_get_dict_path)
 	char *value;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &broker, &dict_type) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -458,7 +458,7 @@ PHP_FUNCTION(enchant_broker_list_dicts)
 	enchant_broker *pbroker;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &broker) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -481,7 +481,7 @@ PHP_FUNCTION(enchant_broker_request_dict)
 	int pos;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &broker, &tag, &taglen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -529,7 +529,7 @@ PHP_FUNCTION(enchant_broker_request_pwl_dict)
 	int pos;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &broker, &pwl, &pwllen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (php_check_open_basedir(pwl)) {
@@ -571,7 +571,7 @@ PHP_FUNCTION(enchant_broker_free_dict)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &dict) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -591,7 +591,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
 	enchant_broker * pbroker;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &broker, &tag, &taglen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -617,7 +617,7 @@ PHP_FUNCTION(enchant_broker_set_ordering)
 	enchant_broker * pbroker;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &broker, &ptag, &ptaglen, &pordering, &porderinglen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -636,7 +636,7 @@ PHP_FUNCTION(enchant_broker_describe)
 	enchant_broker * pbroker;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &broker) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_BROKER;
@@ -656,7 +656,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|z", &dict, &word, &wordlen, &sugg) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (sugg) {
@@ -704,7 +704,7 @@ PHP_FUNCTION(enchant_dict_check)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &dict, &word, &wordlen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -726,7 +726,7 @@ PHP_FUNCTION(enchant_dict_suggest)
 	size_t n_sugg_st;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &dict, &word, &wordlen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -756,7 +756,7 @@ PHP_FUNCTION(enchant_dict_add_to_personal)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &dict, &word, &wordlen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -775,7 +775,7 @@ PHP_FUNCTION(enchant_dict_add_to_session)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &dict, &word, &wordlen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -794,7 +794,7 @@ PHP_FUNCTION(enchant_dict_is_in_session)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &dict, &word, &wordlen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -817,7 +817,7 @@ PHP_FUNCTION(enchant_dict_store_replacement)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &dict, &mis, &mislen, &cor, &corlen) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -835,7 +835,7 @@ PHP_FUNCTION(enchant_dict_get_error)
 	char *msg;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &dict) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;
@@ -857,7 +857,7 @@ PHP_FUNCTION(enchant_dict_describe)
 	enchant_dict *pdict;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &dict) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	PHP_ENCHANT_GET_DICT;