Skip to content

Commit a20f07e

Browse files
nikicnikic
committed
Remove some zpp quiet uses in pgsql
These functions don't do anything special, just use normal zpp.
1 parent 895a22c commit a20f07e

File tree

1 file changed

+20
-29
lines changed

1 file changed

+20
-29
lines changed

‎ext/pgsql/pgsql.c

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4147,9 +4147,8 @@ PHP_FUNCTION(pg_result_error)
41474147
pgsql_result_handle *pg_result;
41484148
char *err = NULL;
41494149

4150-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
4151-
&result) == FAILURE) {
4152-
RETURN_FALSE;
4150+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) {
4151+
RETURN_THROWS();
41534152
}
41544153

41554154
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)
41744173
pgsql_result_handle *pg_result;
41754174
char *field = NULL;
41764175

4177-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "rl",
4178-
&result, &fieldcode) == FAILURE) {
4179-
RETURN_FALSE;
4176+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result, &fieldcode) == FAILURE) {
4177+
RETURN_THROWS();
41804178
}
41814179

41824180
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)
42154213
zval *pgsql_link = NULL;
42164214
PGconn *pgsql;
42174215

4218-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
4219-
&pgsql_link) == FAILURE) {
4220-
RETURN_FALSE;
4216+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4217+
RETURN_THROWS();
42214218
}
42224219

42234220
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)
42354232
zval *pgsql_link = NULL;
42364233
PGconn *pgsql;
42374234

4238-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
4239-
&pgsql_link) == FAILURE) {
4240-
RETURN_FALSE;
4235+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4236+
RETURN_THROWS();
42414237
}
42424238

42434239
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)
42554251
zval *pgsql_link;
42564252
PGconn *pgsql;
42574253

4258-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
4259-
&pgsql_link) == FAILURE) {
4260-
RETURN_FALSE;
4254+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4255+
RETURN_THROWS();
42614256
}
42624257

42634258
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)
43014296
PGconn *pgsql;
43024297
PGresult *pgsql_result;
43034298

4304-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
4305-
&pgsql_link) == FAILURE) {
4306-
RETURN_FALSE;
4299+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4300+
RETURN_THROWS();
43074301
}
43084302

43094303
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)
46994693
PGresult *pgsql_result;
47004694
pgsql_result_handle *pg_result;
47014695

4702-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4703-
RETURN_FALSE;
4696+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4697+
RETURN_THROWS();
47044698
}
47054699

47064700
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)
47294723
PGresult *pgsql_result;
47304724
pgsql_result_handle *pg_result;
47314725

4732-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r|l",
4733-
&result, &result_type) == FAILURE) {
4734-
RETURN_FALSE;
4726+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &result, &result_type) == FAILURE) {
4727+
RETURN_THROWS();
47354728
}
47364729

47374730
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)
47614754
PGconn *pgsql;
47624755
PGnotify *pgsql_notify;
47634756

4764-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r|l",
4765-
&pgsql_link, &result_type) == FAILURE) {
4766-
RETURN_FALSE;
4757+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pgsql_link, &result_type) == FAILURE) {
4758+
RETURN_THROWS();
47674759
}
47684760

47694761
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)
48064798
zval *pgsql_link;
48074799
PGconn *pgsql;
48084800

4809-
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r",
4810-
&pgsql_link) == FAILURE) {
4811-
RETURN_FALSE;
4801+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pgsql_link) == FAILURE) {
4802+
RETURN_THROWS();
48124803
}
48134804

48144805
if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link", le_link, le_plink)) == NULL) {

0 commit comments

Comments
 (0)