summaryrefslogtreecommitdiff
path: root/ext/com_dotnet/com_dotnet.c
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2020-01-03 20:44:29 +0100
committerMáté Kocsis <kocsismate@woohoolabs.com>2020-01-03 21:10:24 +0100
commitaadd3aaed902a8f21c11984687a4e3d414a2caed (patch)
tree0bfab8aacc7044d2ed66ce86d8c92c22721ec97d /ext/com_dotnet/com_dotnet.c
parentbbcfa66e06110d8256595e644378a5358dda3558 (diff)
downloadphp-git-aadd3aaed902a8f21c11984687a4e3d414a2caed.tar.gz
Use RETURN_THROWS() in various places
Diffstat (limited to 'ext/com_dotnet/com_dotnet.c')
-rw-r--r--ext/com_dotnet/com_dotnet.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
index ad35d91636..bee7116fc3 100644
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@ -205,7 +205,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
snprintf(buf, sizeof(buf), "Failed to init .Net runtime [%s] %s", where, err);
php_win32_error_msg_free(err);
php_com_throw_exception(hr, buf);
- return;
+ RETURN_THROWS();
}
stuff = (struct dotnet_runtime_stuff*)COMG(dotnet_runtime_stuff);
@@ -219,7 +219,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
php_win32_error_msg_free(err);
php_com_throw_exception(hr, buf);
ZVAL_NULL(object);
- return;
+ RETURN_THROWS();
}
where = "QI: System._AppDomain";
@@ -231,7 +231,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
php_win32_error_msg_free(err);
php_com_throw_exception(hr, buf);
ZVAL_NULL(object);
- return;
+ RETURN_THROWS();
}
}
@@ -247,7 +247,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
cp_it = php_win32_cp_get_by_id((DWORD)cp);
if (!cp_it) {
php_com_throw_exception(E_INVALIDARG, "Could not create .Net object - invalid codepage!");
- return;
+ RETURN_THROWS();
}
obj->code_page = (int)cp_it->id;
@@ -311,7 +311,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
snprintf(buf, sizeof(buf), "Failed to instantiate .Net object [%s] [0x%08x] %s", where, hr, err);
php_win32_error_msg_free(err);
php_com_throw_exception(hr, buf);
- return;
+ RETURN_THROWS();
}
}
/* }}} */