cvs: php4(php_4_0_4) /ext/oci8 oci8.c
| From: | Thies C. Arntzen | Date: | Sun, 07 Jan 2001 11:55:39 +0000 |
| Subject: | cvs: php4(php_4_0_4) /ext/oci8 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3416@lists.php.net to get a copy of this message | ||
thies Sun Jan 7 03:55:39 2001 EDT
Modified files: (Branch: php_4_0_4)
/php4/ext/oci8 oci8.c
Log:
Merged from rev 1.105
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.104 php4/ext/oci8/oci8.c:1.104.2.1
--- php4/ext/oci8/oci8.c:1.104 Thu Nov 16 02:16:22 2000
+++ php4/ext/oci8/oci8.c Sun Jan 7 03:55:38 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.104 2000/11/16 10:16:22 thies Exp $ */
+/* $Id: oci8.c,v 1.104.2.1 2001/01/07 11:55:38 thies Exp $ */
/* TODO list:
*
@@ -488,7 +488,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.104 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.104.2.1 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -1219,12 +1219,6 @@
statement->columns = emalloc(sizeof(HashTable));
zend_hash_init(statement->columns, 13, NULL, _oci_column_hash_dtor, 0);
- OCIHandleAlloc(OCI(pEnv),
- (dvoid **)¶m,
- OCI_DTYPE_PARAM,
- 0,
- NULL);
-
counter = 1;
statement->error =
@@ -1261,7 +1255,7 @@
(dvoid *)statement->pStmt,
OCI_HTYPE_STMT,
statement->pError,
- (dvoid*)¶m,
+ (dvoid**)¶m,
counter));
if (statement->error) {
return 0; /* XXX we loose memory!!! */