tony2001 Fri Nov 10 23:03:23 2006 UTC
Modified files:
/php-src/ext/oci8 oci8_interface.c oci8_lob.c php_oci8_int.h
Log:
fix type mess (thanks again, Chris)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.19&r2=1.20&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.19
php-src/ext/oci8/oci8_interface.c:1.20
--- php-src/ext/oci8/oci8_interface.c:1.19 Fri Nov 10 16:56:19 2006
+++ php-src/ext/oci8/oci8_interface.c Fri Nov 10 23:03:22 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.19 2006/11/10 16:56:19 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.20 2006/11/10 23:03:22 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -710,7 +710,7 @@
{
zval **tmp, *z_descriptor = getThis();
php_oci_descriptor *descriptor;
- ub4 flush_flag = 0;
+ long flush_flag = 0;
if (getThis()) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l",
&flush_flag) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_lob.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/oci8/oci8_lob.c
diff -u php-src/ext/oci8/oci8_lob.c:1.21 php-src/ext/oci8/oci8_lob.c:1.22
--- php-src/ext/oci8/oci8_lob.c:1.21 Fri Nov 10 21:57:04 2006
+++ php-src/ext/oci8/oci8_lob.c Fri Nov 10 23:03:23 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_lob.c,v 1.21 2006/11/10 21:57:04 tony2001 Exp $ */
+/* $Id: oci8_lob.c,v 1.22 2006/11/10 23:03:23 tony2001 Exp $ */
@@ -580,7 +580,7 @@
/* {{{ php_oci_lob_flush()
Flush buffers for the LOB (only if they have been used) */
-int php_oci_lob_flush(php_oci_descriptor *descriptor, int flush_flag TSRMLS_DC)
+int php_oci_lob_flush(php_oci_descriptor *descriptor, long flush_flag
TSRMLS_DC)
{
OCILobLocator *lob = descriptor->descriptor;
php_oci_connection *connection = descriptor->connection;
@@ -595,7 +595,7 @@
/* only these two are allowed */
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
flag value: %d", flush_flag);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
flag value: %ld", flush_flag);
return 1;
break;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.25
php-src/ext/oci8/php_oci8_int.h:1.26
--- php-src/ext/oci8/php_oci8_int.h:1.25 Fri Nov 10 21:55:05 2006
+++ php-src/ext/oci8/php_oci8_int.h Fri Nov 10 23:03:23 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_oci8_int.h,v 1.25 2006/11/10 21:55:05 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.26 2006/11/10 23:03:23 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -335,7 +335,7 @@
int php_oci_lob_get_type(php_oci_descriptor *descriptor, php_oci_lob_type
*lob_type TSRMLS_DC);
int php_oci_lob_read (php_oci_descriptor *, long, long, zstr *, ub4 *
TSRMLS_DC);
int php_oci_lob_write (php_oci_descriptor *, ub4, zstr, int, ub4 * TSRMLS_DC);
-int php_oci_lob_flush (php_oci_descriptor *, int TSRMLS_DC);
+int php_oci_lob_flush (php_oci_descriptor *, long TSRMLS_DC);
int php_oci_lob_set_buffering (php_oci_descriptor *, int TSRMLS_DC);
int php_oci_lob_get_buffering (php_oci_descriptor *);
int php_oci_lob_copy (php_oci_descriptor *, php_oci_descriptor *, long
TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
