[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8_collection.c

[Antony Dovgal]

tony2001                Sat Dec 23 14:02:50 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/oci8   oci8_collection.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_collection.c?r1=1.5.2.3.2.3&r2=1.5.2.3.2.4&diff_format=u
Index: php-src/ext/oci8/oci8_collection.c
diff -u php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.3 
php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.4
--- php-src/ext/oci8/oci8_collection.c:1.5.2.3.2.3      Mon Aug 21 16:41:13 2006
+++ php-src/ext/oci8/oci8_collection.c  Sat Dec 23 14:02:50 2006
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8_collection.c,v 1.5.2.3.2.3 2006/08/21 16:41:13 tony2001 Exp $ */
+/* $Id: oci8_collection.c,v 1.5.2.3.2.4 2006/12/23 14:02:50 tony2001 Exp $ */
 
 
 
@@ -74,14 +74,14 @@
                        )
        );
 
-       if (connection->errcode) {
+       if (connection->errcode != OCI_SUCCESS) {
                goto CLEANUP;
        }
 
        /* allocate describe handle */
        PHP_OCI_CALL_RETURN(connection->errcode, OCIHandleAlloc, 
(connection->env, (dvoid **) &dschp1, (ub4) OCI_HTYPE_DESCRIBE, (size_t) 0, 
(dvoid **) 0));
 
-       if (connection->errcode) {
+       if (connection->errcode != OCI_SUCCESS) {
                goto CLEANUP;
        }
 
@@ -99,14 +99,14 @@
                        )
        );
 
-       if (connection->errcode) {
+       if (connection->errcode != OCI_SUCCESS) {
                goto CLEANUP;
        }
 
        /* get first parameter handle */
        PHP_OCI_CALL_RETURN(connection->errcode, OCIAttrGet, ((dvoid *) dschp1, 
(ub4) OCI_HTYPE_DESCRIBE, (dvoid *)&parmp1, (ub4 *)0, (ub4)OCI_ATTR_PARAM,      
connection->err));
 
-       if (connection->errcode) {
+       if (connection->errcode != OCI_SUCCESS) {
                goto CLEANUP;
        }
 
@@ -122,7 +122,7 @@
                        )
        );
 
-       if (connection->errcode) {
+       if (connection->errcode != OCI_SUCCESS) {
                goto CLEANUP;
        }
 
@@ -141,7 +141,7 @@
                                        )
                        );
 
-                       if (connection->errcode) {
+                       if (connection->errcode != OCI_SUCCESS) {
                                goto CLEANUP;
                        }
 
@@ -157,7 +157,7 @@
                                        )
                        );
 
-                       if (connection->errcode) {
+                       if (connection->errcode != OCI_SUCCESS) {
                                goto CLEANUP;
                        }
 
@@ -173,7 +173,7 @@
                                        )
                        );
 
-                       if (connection->errcode) {
+                       if (connection->errcode != OCI_SUCCESS) {
                                goto CLEANUP;
                        }
 
@@ -189,13 +189,13 @@
                                        )
                        );
 
-                       if (connection->errcode) {
+                       if (connection->errcode != OCI_SUCCESS) {
                                goto CLEANUP;
                        }
                        break;
                        /* we only support VARRAYs and TABLEs */
                default:
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"OCINewCollection - Unknown Type %d", collection->coll_typecode);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown 
collection type %d", collection->coll_typecode);
                        break;
        }       
 
@@ -214,7 +214,7 @@
                )
        );
 
-       if (connection->errcode) {
+       if (connection->errcode != OCI_SUCCESS) {
                goto CLEANUP;
        }
 

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