Remove some misleading RETURN_FALSE

These functions throw, so they can't return false.

This is just a subset...

3 files changed, 27 insertions, 27 deletions

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 6a25359597..9657feab22 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2108,7 +2108,7 @@ PHP_FUNCTION(curl_copy_handle)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	cp = curl_easy_duphandle(ch->cp);
@@ -3074,7 +3074,7 @@ PHP_FUNCTION(curl_setopt)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (options <= 0 && options != CURLOPT_SAFE_UPLOAD) {
@@ -3105,7 +3105,7 @@ PHP_FUNCTION(curl_setopt_array)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(arr), option, string_key, entry) {
@@ -3152,7 +3152,7 @@ PHP_FUNCTION(curl_exec)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	_php_curl_verify_handlers(ch, 1);
@@ -3211,7 +3211,7 @@ PHP_FUNCTION(curl_getinfo)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ZEND_NUM_ARGS() < 2) {
@@ -3475,7 +3475,7 @@ PHP_FUNCTION(curl_error)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ch->err.no) {
@@ -3499,7 +3499,7 @@ PHP_FUNCTION(curl_errno)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	RETURN_LONG(ch->err.no);
@@ -3518,7 +3518,7 @@ PHP_FUNCTION(curl_close)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ch->in_callback) {
@@ -3692,7 +3692,7 @@ PHP_FUNCTION(curl_reset)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ch->in_callback) {
@@ -3721,7 +3721,7 @@ PHP_FUNCTION(curl_escape)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(str))) {
@@ -3753,7 +3753,7 @@ PHP_FUNCTION(curl_unescape)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ZEND_SIZE_T_INT_OVFL(ZSTR_LEN(str))) {
@@ -3784,7 +3784,7 @@ PHP_FUNCTION(curl_pause)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	RETURN_LONG(curl_easy_pause(ch->cp, bitmask));
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index 4ba165a09d..0998251c4c 100644
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -85,11 +85,11 @@ PHP_FUNCTION(curl_multi_add_handle)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	_php_curl_cleanup_handle(ch);
@@ -171,11 +171,11 @@ PHP_FUNCTION(curl_multi_remove_handle)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	error = curl_multi_remove_handle(mh->multi, ch->cp);
@@ -224,7 +224,7 @@ PHP_FUNCTION(curl_multi_select)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 #if LIBCURL_VERSION_NUM >= 0x071c00 /* Available since 7.28.0 */
@@ -269,7 +269,7 @@ PHP_FUNCTION(curl_multi_exec)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	{
@@ -281,7 +281,7 @@ PHP_FUNCTION(curl_multi_exec)
 			pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) {
 
 			if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(pz_ch), le_curl_name, le_curl)) == NULL) {
-				RETURN_FALSE;
+				return;
 			}
 
 			_php_curl_verify_handlers(ch, 1);
@@ -309,7 +309,7 @@ PHP_FUNCTION(curl_multi_getcontent)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (ch->handlers->write->method == PHP_CURL_RETURN) {
@@ -342,7 +342,7 @@ PHP_FUNCTION(curl_multi_info_read)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	tmp_msg = curl_multi_info_read(mh->multi, &queued_msgs);
@@ -396,7 +396,7 @@ PHP_FUNCTION(curl_multi_close)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	zend_list_close(Z_RES_P(z_mh));
@@ -448,7 +448,7 @@ PHP_FUNCTION(curl_multi_errno)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	RETURN_LONG(mh->err.no);
@@ -627,7 +627,7 @@ PHP_FUNCTION(curl_multi_setopt)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (!_php_curl_multi_setopt(mh, options, zvalue, return_value)) {
diff --git a/ext/curl/share.c b/ext/curl/share.c
index 242cad09cd..4343e2ccc6 100644
--- a/ext/curl/share.c
+++ b/ext/curl/share.c
@@ -62,7 +62,7 @@ PHP_FUNCTION(curl_share_close)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(z_sh), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	zend_list_close(Z_RES_P(z_sh));
@@ -106,7 +106,7 @@ PHP_FUNCTION(curl_share_setopt)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(zid), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	if (!_php_curl_share_setopt(sh, options, zvalue, return_value)) {
@@ -140,7 +140,7 @@ PHP_FUNCTION(curl_share_errno)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((sh = (php_curlsh *)zend_fetch_resource(Z_RES_P(z_sh), le_curl_share_handle_name, le_curl_share_handle)) == NULL) {
-		RETURN_FALSE;
+		return;
 	}
 
 	RETURN_LONG(sh->err.no);