From: Antony Dovgal <tony2001@php.net>
Date: Sat, 23 Dec 2006 14:02:38 +0000 (+0000)
Subject: use OCI_SUCCESS constant, do not rely on its value
X-Git-Tag: RELEASE_1_0_0RC1~540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19060d3a14ba26da0bc588891119cccf5385160c;p=php

use OCI_SUCCESS constant, do not rely on its value
---

diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c
index c46c354480..255becfb9f 100644
--- a/ext/oci8/oci8_collection.c
+++ b/ext/oci8/oci8_collection.c
@@ -74,14 +74,14 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 			)
 	);
 
-	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 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 			)
 	);
 
-	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 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 			)
 	);
 
-	if (connection->errcode) {
+	if (connection->errcode != OCI_SUCCESS) {
 		goto CLEANUP;
 	}
 
@@ -141,7 +141,7 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 					)
 			);
 
-			if (connection->errcode) {
+			if (connection->errcode != OCI_SUCCESS) {
 				goto CLEANUP;
 			}
 
@@ -157,7 +157,7 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 					)
 			);
 
-			if (connection->errcode) {
+			if (connection->errcode != OCI_SUCCESS) {
 				goto CLEANUP;
 			}
 
@@ -173,7 +173,7 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 					)
 			);
 
-			if (connection->errcode) {
+			if (connection->errcode != OCI_SUCCESS) {
 				goto CLEANUP;
 			}
 
@@ -189,13 +189,13 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 					)
 			);
 
-			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 @@ php_oci_collection * php_oci_collection_create(php_oci_connection* connection, z
 		)
 	);
 
-	if (connection->errcode) {
+	if (connection->errcode != OCI_SUCCESS) {
 		goto CLEANUP;
 	}