]> granicus.if.org Git - php/commitdiff
deleted warning output in dbx/pgsql.
authorRui Hirokawa <hirokawa@php.net>
Sat, 14 Apr 2001 10:32:14 +0000 (10:32 +0000)
committerRui Hirokawa <hirokawa@php.net>
Sat, 14 Apr 2001 10:32:14 +0000 (10:32 +0000)
ext/dbx/dbx_pgsql.c
ext/pgsql/pgsql.c

index ecafaa18b96dc824b4679a81fd26487ab920873b..00b7257a4850945a75e74f9abfb8747ad8b8f2d0 100644 (file)
@@ -236,6 +236,7 @@ int dbx_pgsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNA
     /* returns array[0..columncount-1] as strings on success or 0 
           as long on failure */
     int number_of_arguments=2;
+       int save_error_reporting=0;
     zval ** arguments[2];
     zval * zval_row=NULL;
     zval * returned_zval=NULL;
@@ -250,7 +251,14 @@ int dbx_pgsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNA
                return 0;
        }
 */
+       if (EG(error_reporting) & E_WARNING){
+               save_error_reporting = EG(error_reporting);
+               EG(error_reporting) &= ~E_WARNING;
+       }
     dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "pg_fetch_array", &returned_zval, number_of_arguments, arguments);
+       if (save_error_reporting) {
+               EG(error_reporting) = save_error_reporting;
+       }
     if (!returned_zval || returned_zval->type!=IS_ARRAY) {
         if (returned_zval) zval_ptr_dtor(&returned_zval);
         FREE_ZVAL(zval_row);
index 8d5044fe077b0b1ddd965199929d8d451011917d..69ddcc4e1b4037cc72727da5631a0be741eb9532 100644 (file)
@@ -533,8 +533,6 @@ PHP_FUNCTION(pg_close)
        
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link, le_plink);
 
-       printf("\npg_close %d\n",id);
-
        if (id==-1) { /* explicit resource number */
                zend_list_delete(Z_RESVAL_PP(pgsql_link));
        }