Changed pg_connection_info()/pg_connection_reset()/pg_connection_busy()/pg_result_sta...

@ Changed pg_connection_info()/pg_connection_reset()/pg_connection_busy()/pg_result_status()/pg_result_error() silently return FALSE when resource is not passed to them. (Yasuo)

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 2b63a9c271138b8f884384ce958bee0361bfdac8..bd35d2412c506f05c87e57e6f8c0ec2531f35b37 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2598,9 +2598,9 @@ PHP_FUNCTION(pg_result_error)
        pgsql_result_handle *pg_result;
        char *err = NULL;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
-                                                         &result) == FAILURE) {
-               return;
+       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "r",
+                                                                &result) == FAILURE) {
+               RETURN_FALSE;
        }
        
        ZEND_FETCH_RESOURCE(pg_result, pgsql_result_handle *, &result, -1, "PostgreSQL result", le_result);
@@ -2622,9 +2622,9 @@ PHP_FUNCTION(pg_connection_status)
        int id = -1;
        PGconn *pgsql;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
-                                                         &pgsql_link) == FAILURE) {
-               return;
+       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "r",
+                                                                &pgsql_link) == FAILURE) {
+               RETURN_FALSE;
        }
 
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
@@ -2642,9 +2642,9 @@ PHP_FUNCTION(pg_connection_reset)
        int id = -1;
        PGconn *pgsql;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
-                                                         &pgsql_link) == FAILURE) {
-               return;
+       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "r",
+                                                                &pgsql_link) == FAILURE) {
+               RETURN_FALSE;
        }
 
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
@@ -2691,9 +2691,9 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
        PGconn *pgsql;
        PGresult *pgsql_result;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
-                                                         &pgsql_link) == FAILURE) {
-               return;
+       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "r",
+                                                                &pgsql_link) == FAILURE) {
+               RETURN_FALSE;
        }
 
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
@@ -2799,9 +2799,9 @@ PHP_FUNCTION(pg_get_result)
        PGresult *pgsql_result;
        pgsql_result_handle *pg_result;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r",
-                                                         &pgsql_link) == FAILURE) {
-               return;
+       if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "r",
+                                                                &pgsql_link) == FAILURE) {
+               RETURN_FALSE;
        }
 
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
@@ -2830,13 +2830,7 @@ PHP_FUNCTION(pg_result_status)
        pgsql_result_handle *pg_result;
 
        if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "r|l",
-                                                         &result, &result_type) == SUCCESS) {
-       }
-       else {
-               if (Z_TYPE_P(result) != IS_RESOURCE)
-                       RETURN_FALSE;
-               php_error(E_WARNING,"%s expects parameter 1 to be resource and 2 to be integer",
-                                 get_active_function_name(TSRMLS_C));
+                                                                &result, &result_type) == FAILURE) {
                RETURN_FALSE;
        }