]> granicus.if.org Git - php/commitdiff
Remove some zpp quiet uses in pgsql
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 17 Jul 2020 13:24:24 +0000 (15:24 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 17 Jul 2020 13:24:46 +0000 (15:24 +0200)
These functions don't do anything special, just use normal zpp.

ext/pgsql/pgsql.c

index 5b3dc9a80cd7eb0cb9058947b009fbffc569ea02..fbf7cf9b728c5eb8f5fd77b3281b21e937da1032 100644 (file)
@@ -4147,9 +4147,8 @@ PHP_FUNCTION(pg_result_error)
        pgsql_result_handle *pg_result;
        char *err = NULL;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
-                                                                &result) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pg_result = (pgsql_result_handle *)zend_fetch_resource(Z_RES_P(result), "PostgreSQL result", le_result)) == NULL) {
@@ -4174,9 +4173,8 @@ PHP_FUNCTION(pg_result_error_field)
        pgsql_result_handle *pg_result;
        char *field = NULL;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "rl",
-                                                                &result, &fieldcode) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result, &fieldcode) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pg_result = (pgsql_result_handle *)zend_fetch_resource(Z_RES_P(result), "PostgreSQL result", le_result)) == NULL) {
@@ -4215,9 +4213,8 @@ PHP_FUNCTION(pg_connection_status)
        zval *pgsql_link = NULL;
        PGconn *pgsql;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
-                                                                &pgsql_link) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -4235,9 +4232,8 @@ PHP_FUNCTION(pg_transaction_status)
        zval *pgsql_link = NULL;
        PGconn *pgsql;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
-                                                                &pgsql_link) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -4255,9 +4251,8 @@ PHP_FUNCTION(pg_connection_reset)
        zval *pgsql_link;
        PGconn *pgsql;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
-                                                                &pgsql_link) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -4301,9 +4296,8 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
        PGconn *pgsql;
        PGresult *pgsql_result;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
-                                                                &pgsql_link) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -4699,8 +4693,8 @@ PHP_FUNCTION(pg_get_result)
        PGresult *pgsql_result;
        pgsql_result_handle *pg_result;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -4729,9 +4723,8 @@ PHP_FUNCTION(pg_result_status)
        PGresult *pgsql_result;
        pgsql_result_handle *pg_result;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r|l",
-                                                                &result, &result_type) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &result, &result_type) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pg_result = (pgsql_result_handle *)zend_fetch_resource(Z_RES_P(result), "PostgreSQL result", le_result)) == NULL) {
@@ -4761,9 +4754,8 @@ PHP_FUNCTION(pg_get_notify)
        PGconn *pgsql;
        PGnotify *pgsql_notify;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r|l",
-                                                                &pgsql_link, &result_type) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pgsql_link, &result_type) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {
@@ -4806,9 +4798,8 @@ PHP_FUNCTION(pg_get_pid)
        zval *pgsql_link;
        PGconn *pgsql;
 
-       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
-                                                                &pgsql_link) == FAILURE) {
-               RETURN_FALSE;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
+               RETURN_THROWS();
        }
 
        if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {