Skip to content

Commit de6a771

Browse files
committed
changes from review
1 parent 4144c98 commit de6a771

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

ext/pgsql/pgsql.c

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2840,26 +2840,19 @@ PHP_FUNCTION(pg_set_error_context_visibility)
28402840
PGconn *pgsql;
28412841
pgsql_link_handle *link;
28422842

2843-
if (ZEND_NUM_ARGS() == 1) {
2844-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &visibility) == FAILURE) {
2845-
RETURN_THROWS();
2846-
}
2847-
link = FETCH_DEFAULT_LINK();
2848-
CHECK_DEFAULT_LINK(link);
2849-
} else {
2850-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &pgsql_link, pgsql_link_ce, &visibility) == FAILURE) {
2851-
RETURN_THROWS();
2852-
}
2853-
link = Z_PGSQL_LINK_P(pgsql_link);
2854-
CHECK_PGSQL_LINK(link);
2843+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &pgsql_link, pgsql_link_ce, &visibility) == FAILURE) {
2844+
RETURN_THROWS();
28552845
}
2846+
link = Z_PGSQL_LINK_P(pgsql_link);
2847+
CHECK_PGSQL_LINK(link);
28562848

28572849
pgsql = link->conn;
28582850

2859-
if (visibility & (PQSHOW_CONTEXT_NEVER|PQSHOW_CONTEXT_ERRORS|PQSHOW_CONTEXT_ALWAYS)) {
2851+
if (visibility == PQSHOW_CONTEXT_NEVER || visibility & (PQSHOW_CONTEXT_ERRORS|PQSHOW_CONTEXT_ALWAYS)) {
28602852
RETURN_LONG(PQsetErrorContextVisibility(pgsql, visibility));
28612853
} else {
2862-
RETURN_FALSE;
2854+
zend_argument_value_error(2, "must be one of PGSQL_SHOW_CONTEXT_NEVER, PGSQL_SHOW_CONTEXT_ERRORS or PGSQL_SHOW_CONTEXT_ALWAYS");
2855+
RETURN_THROWS();
28632856
}
28642857
}
28652858

0 commit comments

Comments
 (0)