sixd Mon Mar 9 20:58:51 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 php_oci8_int.h oci8_statement.c
Log:
MFH: Make non-public prototype match the type passed at call
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.11.2.6.2.21.2.13&r2=1.11.2.6.2.21.2.14&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.21.2.13
php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.21.2.14
--- php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.21.2.13 Mon Mar 9 20:09:07 2009
+++ php-src/ext/oci8/php_oci8_int.h Mon Mar 9 20:58:51 2009
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_oci8_int.h,v 1.11.2.6.2.21.2.13 2009/03/09 20:09:07 sixd Exp $ */
+/* $Id: php_oci8_int.h,v 1.11.2.6.2.21.2.14 2009/03/09 20:58:51 sixd Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -441,7 +441,7 @@
void php_oci_statement_free (php_oci_statement * TSRMLS_DC);
int php_oci_bind_pre_exec(void *data TSRMLS_DC);
int php_oci_bind_post_exec(void *data TSRMLS_DC);
-int php_oci_bind_by_name(php_oci_statement *, char *, int, zval*, long, long
TSRMLS_DC);
+int php_oci_bind_by_name(php_oci_statement *, char *, int, zval*, long, ub2
TSRMLS_DC);
sb4 php_oci_bind_in_callback(dvoid *, OCIBind *, ub4, ub4, dvoid **, ub4 *,
ub1 *, dvoid **);
sb4 php_oci_bind_out_callback(dvoid *, OCIBind *, ub4, ub4, dvoid **, ub4 **,
ub1 *, dvoid **, ub2 **);
php_oci_out_column
*php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAMETERS, int
need_data);
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.28.2.11&r2=1.7.2.14.2.28.2.12&diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.11
php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.12
--- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.11 Wed Dec 31
11:15:39 2008
+++ php-src/ext/oci8/oci8_statement.c Mon Mar 9 20:58:51 2009
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.11 2008/12/31 11:15:39 sebastian
Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.12 2009/03/09 20:58:51 sixd Exp $ */
#ifdef HAVE_CONFIG_H
@@ -883,7 +883,7 @@
/* {{{ php_oci_bind_by_name()
Bind zval to the given placeholder */
-int php_oci_bind_by_name(php_oci_statement *statement, char *name, int
name_len, zval* var, long maxlength, long type TSRMLS_DC)
+int php_oci_bind_by_name(php_oci_statement *statement, char *name, int
name_len, zval* var, long maxlength, ub2 type TSRMLS_DC)
{
php_oci_collection *bind_collection = NULL;
php_oci_descriptor *bind_descriptor = NULL;
@@ -975,7 +975,7 @@
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or
unsupported datatype given: %ld", type);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or
unsupported datatype given: %d", (int)type);
return 1;
break;
}
@@ -1008,14 +1008,14 @@
PHP_OCI_CALL_RETURN(statement->errcode,
OCIBindByName,
(
- statement->stmt, /*
statement handle */
- (OCIBind **)&bindp->bind, /* bind hdl
(will alloc) */
- statement->err, /* error
handle */
+ statement->stmt, /*
statement handle */
+ (OCIBind **)&bindp->bind, /* bind hdl
(will alloc) */
+ statement->err, /*
error handle */
(text*) name, /*
placeholder name */
name_len,
/* placeholder length */
(dvoid *)bind_data, /*
in/out data */
value_sz, /* PHP_OCI_MAX_DATA_SIZE, */ /* max size of
input/output data */
- (ub2)type,
/* in/out data type */
+ type,
/* in/out data type */
(dvoid *)&bindp->indicator, /* indicator
(ignored) */
(ub2 *)0,
/* size array (ignored) */
(ub2 *)&bindp->retcode, /* return code
(ignored) */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
