tony2001 Fri Dec 8 20:55:14 2006 UTC
Modified files:
/php-src/ext/oci8 oci8_lob.c php_oci8_int.h
Log:
fix #39732 (oci_bind_array_by_name doesn't work on Solaris 64bit)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.22 php-src/ext/oci8/oci8_lob.c:1.23
--- php-src/ext/oci8/oci8_lob.c:1.22 Fri Nov 10 23:03:23 2006
+++ php-src/ext/oci8/oci8_lob.c Fri Dec 8 20:55:13 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_lob.c,v 1.22 2006/11/10 23:03:23 tony2001 Exp $ */
+/* $Id: oci8_lob.c,v 1.23 2006/12/08 20:55:13 tony2001 Exp $ */
@@ -500,7 +500,7 @@
int php_oci_lob_copy (php_oci_descriptor *descriptor_dest, php_oci_descriptor
*descriptor_from, long length TSRMLS_DC)
{
php_oci_connection *connection = descriptor_dest->connection;
- int length_dest, length_from, copy_len;
+ ub4 length_dest, length_from, copy_len;
if (php_oci_lob_get_length(descriptor_dest, &length_dest TSRMLS_CC)) {
return 1;
@@ -767,7 +767,7 @@
/* {{{ php_oci_lob_erase()
Erase (or fill with whitespaces, depending on LOB type) the LOB (or its part)
*/
-int php_oci_lob_erase (php_oci_descriptor *descriptor, long offset, long
length, ub4 *bytes_erased TSRMLS_DC)
+int php_oci_lob_erase (php_oci_descriptor *descriptor, long offset, ub4
length, ub4 *bytes_erased TSRMLS_DC)
{
php_oci_connection *connection = descriptor->connection;
OCILobLocator *lob = descriptor->descriptor;
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.26
php-src/ext/oci8/php_oci8_int.h:1.27
--- php-src/ext/oci8/php_oci8_int.h:1.26 Fri Nov 10 23:03:23 2006
+++ php-src/ext/oci8/php_oci8_int.h Fri Dec 8 20:55:14 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_oci8_int.h,v 1.26 2006/11/10 23:03:23 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.27 2006/12/08 20:55:14 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -191,9 +191,9 @@
/* ub2 *indicators; */
ub2 *element_lengths;
/* ub2 *retcodes; */
- long current_length;
- long old_length;
- long max_length;
+ ub4 current_length;
+ ub4 old_length;
+ ub4 max_length;
long type;
} array;
sb2 indicator; /* -1 means NULL */
@@ -347,7 +347,7 @@
int php_oci_lob_import(php_oci_descriptor *descriptor, char * TSRMLS_DC);
int php_oci_lob_append (php_oci_descriptor *, php_oci_descriptor * TSRMLS_DC);
int php_oci_lob_truncate (php_oci_descriptor *, long TSRMLS_DC);
-int php_oci_lob_erase (php_oci_descriptor *, long, long, ub4 * TSRMLS_DC);
+int php_oci_lob_erase (php_oci_descriptor *, long, ub4, ub4 * TSRMLS_DC);
int php_oci_lob_is_equal (php_oci_descriptor *, php_oci_descriptor *, boolean
* TSRMLS_DC);
#if defined(HAVE_OCI_LOB_READ2)
sb4 php_oci_lob_callback (dvoid *ctxp, CONST dvoid *bufxp, oraub8 len, ub1
piece, dvoid **changed_bufpp, oraub8 *changed_lenp);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
