sixd Fri, 16 Apr 2010 19:47:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298085
Log: Merge Kalle's tidy-up from trunk to keep files in sync Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c 2010-04-16 18:32:44 UTC (rev 298084) +++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c 2010-04-16 19:47:23 UTC (rev 298085) @@ -336,9 +336,9 @@ sb4 php_oci_define_callback(dvoid *ctx, OCIDefine *define, ub4 iter, dvoid **bufpp, ub4 **alenpp, ub1 *piecep, dvoid **indpp, ub2 **rcpp) { php_oci_out_column *outcol = (php_oci_out_column *)ctx; + TSRMLS_FETCH(); if (!outcol) { - TSRMLS_FETCH(); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid context pointer value"); return OCI_ERROR; @@ -347,7 +347,6 @@ switch(outcol->data_type) { case SQLT_RSET: { php_oci_statement *nested_stmt; - TSRMLS_FETCH(); nested_stmt = php_oci_statement_create(outcol->statement->connection, NULL, 0 TSRMLS_CC); if (!nested_stmt) { @@ -372,7 +371,6 @@ case SQLT_BFILE: { php_oci_descriptor *descr; int dtype; - TSRMLS_FETCH(); if (outcol->data_type == SQLT_BFILE) { dtype = OCI_DTYPE_FILE;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php