cvs: php-src(PHP_5_2) /ext/oci8 oci8_interface.c oci8_lob.c php_oci8_int.h

tony2001 Fri Nov 10 23:03:32 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 oci8_interface.c oci8_lob.c php_oci8_int.h Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.3&r2=1.8.2.7.2.4&diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.3 php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.4 --- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.3 Tue Aug 22 11:09:12 2006 +++ php-src/ext/oci8/oci8_interface.c Fri Nov 10 23:03:32 2006 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_interface.c,v 1.8.2.7.2.3 2006/08/22 11:09:12 tony2001 Exp $ */ +/* $Id: oci8_interface.c,v 1.8.2.7.2.4 2006/11/10 23:03:32 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -674,7 +674,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.7.2.6.2.6&r2=1.7.2.6.2.7&diff_format=u Index: php-src/ext/oci8/oci8_lob.c diff -u php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.6 php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.7 --- php-src/ext/oci8/oci8_lob.c:1.7.2.6.2.6 Tue Aug 22 11:09:12 2006 +++ php-src/ext/oci8/oci8_lob.c Fri Nov 10 23:03:32 2006 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_lob.c,v 1.7.2.6.2.6 2006/08/22 11:09:12 tony2001 Exp $ */ +/* $Id: oci8_lob.c,v 1.7.2.6.2.7 2006/11/10 23:03:32 tony2001 Exp $ */ @@ -573,7 +573,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; @@ -588,7 +588,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.11.2.6.2.9&r2=1.11.2.6.2.10&diff_format=u Index: php-src/ext/oci8/php_oci8_int.h diff -u php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.9 php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.10 --- php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.9 Fri Nov 10 20:13:36 2006 +++ php-src/ext/oci8/php_oci8_int.h Fri Nov 10 23:03:32 2006 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_oci8_int.h,v 1.11.2.6.2.9 2006/11/10 20:13:36 tony2001 Exp $ */ +/* $Id: php_oci8_int.h,v 1.11.2.6.2.10 2006/11/10 23:03:32 tony2001 Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_INT_H @@ -325,7 +325,7 @@ int php_oci_lob_get_length (php_oci_descriptor *, ub4 * TSRMLS_DC); int php_oci_lob_read (php_oci_descriptor *, long, long, char **, ub4 * TSRMLS_DC); int php_oci_lob_write (php_oci_descriptor *, ub4, char *, 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);