diff options
| author | Christopher Jones <sixd@php.net> | 2009-03-09 20:58:13 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2009-03-09 20:58:13 +0000 |
| commit | 3db98baa59204889ae5f331a44d84f73efff8b2d (patch) | |
| tree | d7f860fcfcd51b8d793a605673d4b4415b1db9bc | |
| parent | cdf17a3f92aa34ba00587b102b990eb4ce4abdd9 (diff) | |
| download | php-git-3db98baa59204889ae5f331a44d84f73efff8b2d.tar.gz | |
Make non-public prototype match the type passed at call
| -rw-r--r-- | ext/oci8/oci8_statement.c | 16 | ||||
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index 66b3a18d46..4c21d2a035 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -918,7 +918,7 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC) /* {{{ php_oci_bind_by_name() Bind zval to the given placeholder */ -int php_oci_bind_by_name(php_oci_statement *statement, zstr name, int name_len, zval* var, long maxlength, long type, zend_uchar uni_type TSRMLS_DC) +int php_oci_bind_by_name(php_oci_statement *statement, zstr name, int name_len, zval* var, long maxlength, ub2 type, zend_uchar uni_type TSRMLS_DC) { php_oci_collection *bind_collection = NULL; php_oci_descriptor *bind_descriptor = NULL; @@ -1020,7 +1020,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, zstr name, int name_len, 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; } @@ -1053,14 +1053,14 @@ int php_oci_bind_by_name(php_oci_statement *statement, zstr name, int name_len, PHP_OCI_CALL_RETURN(statement->errcode, OCIBindByName, ( - statement->stmt, /* statement handle */ - (OCIBind **)&bindp->bind, /* bind hdl (will alloc) */ - statement->err, /* error handle */ - (text*) name.s, /* placeholder name */ - USTR_BYTES(uni_type, name_len), /* placeholder length */ + statement->stmt, /* statement handle */ + (OCIBind **)&bindp->bind, /* bind hdl (will alloc) */ + statement->err, /* error handle */ + (text*) name.s, /* placeholder name */ + USTR_BYTES(uni_type, name_len), /* placeholder length */ (dvoid *)bind_data, /* in/out data */ TEXT_BYTES(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) */ diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 55aa1f3ca3..06c77c5504 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -452,7 +452,7 @@ int php_oci_statement_cancel (php_oci_statement * TSRMLS_DC); 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 *, zstr, int, zval*, long, long, zend_uchar TSRMLS_DC); +int php_oci_bind_by_name(php_oci_statement *, zstr, int, zval*, long, ub2, zend_uchar 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); |