mboeren Wed Apr 18 05:34:53 2001 EDT Modified files: /php4/ext/dbx dbx_pgsql.c Log: Removed some old commented code (Mc) Index: php4/ext/dbx/dbx_pgsql.c diff -u php4/ext/dbx/dbx_pgsql.c:1.6 php4/ext/dbx/dbx_pgsql.c:1.7 --- php4/ext/dbx/dbx_pgsql.c:1.6 Sat Apr 14 03:32:14 2001 +++ php4/ext/dbx/dbx_pgsql.c Wed Apr 18 05:34:52 2001 @@ -20,13 +20,7 @@ #include "php_dbx.h" #include "dbx_pgsql.h" #include <string.h> -/* -#ifdef ZTS -extern int dbx_globals_id; -#else -extern ZEND_DBX_API zend_dbx_globals dbx_globals; -#endif -*/ + #define PGSQL_ASSOC 1<<0 #define PGSQL_NUM 1<<1 @@ -156,17 +150,7 @@ return 0; } MOVE_RETURNED_TO_RV(rv, returned_zval); -/* - if(strstr(Z_STRVAL_PP(sql_statement), "SELECT") || - strstr(Z_STRVAL_PP(sql_statement), "select")){ - DBXG(row_count) = 0; - args[0]=rv; - nargs = 1; - dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "pg_numrows", &num_rows_zval, nargs, args); - DBXG(num_rows) = Z_LVAL_P(num_rows_zval); - } -*/ return 1; } @@ -245,13 +229,8 @@ ZVAL_LONG(zval_row, row_number); arguments[0]=result_handle; arguments[1]=&zval_row; -/* - DBXG(row_count)++; - if (DBXG(row_count)>DBXG(num_rows)){ - return 0; - } -*/ - if (EG(error_reporting) & E_WARNING){ + + if (EG(error_reporting) & E_WARNING){ save_error_reporting = EG(error_reporting); EG(error_reporting) &= ~E_WARNING; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]