archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Some zpp cleanup in pgsql

Browse source
This commit is contained in:
Nikita Popov 2020-07-17 15:31:22 +02:00
parent a20f07ee59
commit 658e861fbb
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ext/pgsql/pgsql.c
View file

@ -1585,16 +1585,20 @@ PHP_FUNCTION(pg_parameter_status)
/* {{{ Ping database. If connection is bad, try to reconnect. */
PHP_FUNCTION(pg_ping)
{
zval *pgsql_link;
zval *pgsql_link = NULL;
PGconn *pgsql;
PGresult *res;
zend_resource *link;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "r", &pgsql_link) == SUCCESS) {
link = Z_RES_P(pgsql_link);
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &pgsql_link) == FAILURE) {
RETURN_THROWS();
}
if (pgsql_link == NULL) {
link = FETCH_DEFAULT_LINK();
CHECK_DEFAULT_LINK(link);
} else {
link = Z_RES_P(pgsql_link);
}
if ((pgsql = (PGconn *)zend_fetch_resource2(link, "PostgreSQL link", le_link, le_plink)) == NULL) {
@ -2926,15 +2930,14 @@ PHP_FUNCTION(pg_trace)
PHP_FUNCTION(pg_untrace)
{
zval *pgsql_link = NULL;
int argc = ZEND_NUM_ARGS();
PGconn *pgsql;
zend_resource *link;
if (zend_parse_parameters(argc, "|r", &pgsql_link) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &pgsql_link) == FAILURE) {
RETURN_THROWS();
}
if (argc == 0) {
if (pgsql_link == NULL) {
link = FETCH_DEFAULT_LINK();
CHECK_DEFAULT_LINK(link);
} else {
@ -3688,15 +3691,14 @@ PHP_FUNCTION(pg_set_client_encoding)
PHP_FUNCTION(pg_client_encoding)
{
zval *pgsql_link = NULL;
int argc = ZEND_NUM_ARGS();
PGconn *pgsql;
zend_resource *link;
if (zend_parse_parameters(argc, "|r", &pgsql_link) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &pgsql_link) == FAILURE) {
RETURN_THROWS();
}
if (argc == 0) {
if (pgsql_link == NULL) {
link = FETCH_DEFAULT_LINK();
CHECK_DEFAULT_LINK(link);
} else {
@ -3717,16 +3719,15 @@ PHP_FUNCTION(pg_client_encoding)
PHP_FUNCTION(pg_end_copy)
{
zval *pgsql_link = NULL;
int argc = ZEND_NUM_ARGS();
PGconn *pgsql;
int result = 0;
zend_resource *link;
if (zend_parse_parameters(argc, "|r", &pgsql_link) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &pgsql_link) == FAILURE) {
RETURN_THROWS();
}
if (argc == 0) {
if (pgsql_link == NULL) {
link = FETCH_DEFAULT_LINK();
CHECK_DEFAULT_LINK(link);
} else {