From: Rui Hirokawa <hirokawa@php.net>
Date: Sat, 14 Apr 2001 10:32:14 +0000 (+0000)
Subject: deleted warning output in dbx/pgsql.
X-Git-Tag: php-4.0.6RC1~416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=053994b5eb002c0fed229bb9e707224a5c8feed0;p=php

deleted warning output in dbx/pgsql.
---

diff --git a/ext/dbx/dbx_pgsql.c b/ext/dbx/dbx_pgsql.c
index ecafaa18b9..00b7257a48 100644
--- a/ext/dbx/dbx_pgsql.c
+++ b/ext/dbx/dbx_pgsql.c
@@ -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);
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 8d5044fe07..69ddcc4e1b 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -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));
 	}