[PHP-CVS] cvs: php4(PHP_4_3) /ext/dbx dbx_pgsql.c

[Marc Boeren]

mboeren         Wed Feb 19 11:52:05 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/dbx       dbx_pgsql.c 
  Log:
  MFH: Fix for bug #22221
  
  
Index: php4/ext/dbx/dbx_pgsql.c
diff -u php4/ext/dbx/dbx_pgsql.c:1.20.2.1 php4/ext/dbx/dbx_pgsql.c:1.20.2.2
--- php4/ext/dbx/dbx_pgsql.c:1.20.2.1   Tue Dec 31 11:34:24 2002
+++ php4/ext/dbx/dbx_pgsql.c    Wed Feb 19 11:52:05 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dbx_pgsql.c,v 1.20.2.1 2002/12/31 16:34:24 sebastian Exp $ */
+/* $Id: dbx_pgsql.c,v 1.20.2.2 2003/02/19 16:52:05 mboeren Exp $ */
 
 #include "dbx.h"
 #include "php_dbx.h"
@@ -228,31 +228,17 @@
 int dbx_pgsql_getrow(zval **rv, zval **result_handle, long row_number, 
INTERNAL_FUNCTION_PARAMETERS)
 {
        /* 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;
+       int number_of_arguments=1;
+       zval **arguments[1];
        zval *returned_zval=NULL;
        
-       MAKE_STD_ZVAL(zval_row);
-       ZVAL_LONG(zval_row, row_number);
        arguments[0]=result_handle;
-       arguments[1]=&zval_row;
 
-       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 || Z_TYPE_P(returned_zval)!=IS_ARRAY) {
                if (returned_zval) zval_ptr_dtor(&returned_zval);
-               FREE_ZVAL(zval_row);
                return 0;
        }
-       FREE_ZVAL(zval_row);
        MOVE_RETURNED_TO_RV(rv, returned_zval);
        return 1;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php