cvs: php-src /ext/oci8 oci8_collection.c
| From: | Antony Dovgal | Date: | Sat, 23 Dec 2006 14:02:38 +0000 |
| Subject: | cvs: php-src /ext/oci8 oci8_collection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42317@lists.php.net to get a copy of this message | ||
tony2001 Sat Dec 23 14:02:38 2006 UTC
Modified files:
/php-src/ext/oci8 oci8_collection.c
Log:
use OCI_SUCCESS constant, do not rely on its value
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_collection.c?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/oci8/oci8_collection.c
diff -u php-src/ext/oci8/oci8_collection.c:1.10 php-src/ext/oci8/oci8_collection.c:1.11
--- php-src/ext/oci8/oci8_collection.c:1.10 Fri Nov 10 16:56:19 2006
+++ php-src/ext/oci8/oci8_collection.c Sat Dec 23 14:02:38 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_collection.c,v 1.10 2006/11/10 16:56:19 tony2001 Exp $ */
+/* $Id: oci8_collection.c,v 1.11 2006/12/23 14:02:38 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;
}