Use RETURN_THROWS() during ZPP in bz2, calendar, com_dotnet extensions

4 files changed, 19 insertions, 19 deletions

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 526ccf7977..0ae3df5641 100644
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -298,7 +298,7 @@ PHP_FUNCTION(com_get_active_object)
 	php_com_initialize();
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|l",
 				&module_name, &module_name_len, &code_page)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	module = php_com_string_to_olestring(module_name, module_name_len, (int)code_page);
@@ -666,7 +666,7 @@ PHP_FUNCTION(com_create_guid)
 	OLECHAR *guid_string;
 
 	if (zend_parse_parameters_none() == FAILURE) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_com_initialize();
@@ -699,7 +699,7 @@ PHP_FUNCTION(com_event_sink)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "Oo|z/",
 			&object, php_com_variant_class_entry, &sinkobject, &sink)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_com_initialize();
@@ -760,7 +760,7 @@ PHP_FUNCTION(com_print_typeinfo)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "z/|s!b", &arg1, &ifacename,
 				&ifacelen, &wantsink)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_com_initialize();
@@ -792,7 +792,7 @@ PHP_FUNCTION(com_message_pump)
 	DWORD result;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &timeoutms) == FAILURE)
-		return;
+		RETURN_THROWS();
 
 	php_com_initialize();
 	result = MsgWaitForMultipleObjects(0, NULL, FALSE, (DWORD)timeoutms, QS_ALLINPUT);
@@ -823,7 +823,7 @@ PHP_FUNCTION(com_load_typelib)
 	int cached = 0;
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|b", &name, &namelen, &cs)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (!cs) {
diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
index 40fb6479b1..ad35d91636 100644
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@ -241,7 +241,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
 			&assembly_name, &assembly_name_len,
 			&datatype_name, &datatype_name_len,
 			&cp)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	cp_it = php_win32_cp_get_by_id((DWORD)cp);
diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index dc320c966c..9710972a86 100644
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@@ -380,7 +380,7 @@ CPH_METHOD(SaveToFile)
 	if (helper->ipf) {
 		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "p!|b",
 					&filename, &filename_len, &remember)) {
-			return;
+			RETURN_THROWS();
 		}
 
 		if (filename) {
@@ -443,7 +443,7 @@ CPH_METHOD(LoadFromFile)
 
 		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "p|l",
 					&filename, &filename_len, &flags)) {
-			return;
+			RETURN_THROWS();
 		}
 
 		if (!(fullpath = expand_filepath(filename, NULL))) {
@@ -538,7 +538,7 @@ CPH_METHOD(LoadFromStream)
 	CPH_FETCH();
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zstm)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_stream_from_zval_no_verify(stream, zstm);
@@ -599,7 +599,7 @@ CPH_METHOD(SaveToStream)
 	CPH_NO_OBJ();
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zstm)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_stream_from_zval_no_verify(stream, zstm);
@@ -646,7 +646,7 @@ CPH_METHOD(__construct)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "|O!",
 				&zobj, php_com_variant_class_entry)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (!zobj) {
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index e74739135a..2a545e1221 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -450,7 +450,7 @@ PHP_FUNCTION(com_variant_create_instance)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
 		"z!|ll", &zvalue, &vt, &codepage)) {
-			return;
+			RETURN_THROWS();
 	}
 
 	php_com_initialize();
@@ -511,7 +511,7 @@ PHP_FUNCTION(variant_set)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
 			"Oz!", &zobj, php_com_variant_class_entry, &zvalue)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	obj = CDNO_FETCH(zobj);
@@ -955,7 +955,7 @@ PHP_FUNCTION(variant_date_to_timestamp)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
 		"O", &zleft, php_com_variant_class_entry)) {
-		return;
+		RETURN_THROWS();
 	}
 	obj = CDNO_FETCH(zleft);
 
@@ -994,7 +994,7 @@ PHP_FUNCTION(variant_date_from_timestamp)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l",
 			&timestamp)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (timestamp < 0) {
@@ -1040,7 +1040,7 @@ PHP_FUNCTION(variant_get_type)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
 		"O", &zobj, php_com_variant_class_entry)) {
-		return;
+		RETURN_THROWS();
 	}
 	obj = CDNO_FETCH(zobj);
 
@@ -1059,7 +1059,7 @@ PHP_FUNCTION(variant_set_type)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
 		"Ol", &zobj, php_com_variant_class_entry, &vt)) {
-		return;
+		RETURN_THROWS();
 	}
 	obj = CDNO_FETCH(zobj);
 
@@ -1095,7 +1095,7 @@ PHP_FUNCTION(variant_cast)
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
 		"Ol", &zobj, php_com_variant_class_entry, &vt)) {
-		return;
+		RETURN_THROWS();
 	}
 	obj = CDNO_FETCH(zobj);