diff options
| author | Christopher Jones <sixd@php.net> | 2011-07-27 00:04:23 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2011-07-27 00:04:23 +0000 |
| commit | 823d7a0534c3eaec7c8f6ff4889240df77baa58e (patch) | |
| tree | cbc9c353a1fd6cb3245016434e727664dbb00818 | |
| parent | 97913140b57a2777757f4982bac3e65d68547f44 (diff) | |
| download | php-git-823d7a0534c3eaec7c8f6ff4889240df77baa58e.tar.gz | |
Add explicit casts to remove some of Pierre's snapshot build warnings
| -rw-r--r-- | ext/oci8/oci8_lob.c | 6 | ||||
| -rw-r--r-- | ext/oci8/oci8_statement.c | 2 | ||||
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c index 0169583347..c55e0d6077 100644 --- a/ext/oci8/oci8_lob.c +++ b/ext/oci8/oci8_lob.c @@ -893,7 +893,7 @@ int php_oci_lob_is_equal (php_oci_descriptor *descriptor_first, php_oci_descript /* {{{ php_oci_lob_write_tmp() Create temporary LOB and write data to it */ -int php_oci_lob_write_tmp (php_oci_descriptor *descriptor, ub1 type, char *data, int data_len TSRMLS_DC) +int php_oci_lob_write_tmp (php_oci_descriptor *descriptor, long type, char *data, int data_len TSRMLS_DC) { php_oci_connection *connection = descriptor->connection; OCILobLocator *lob = descriptor->descriptor; @@ -905,7 +905,7 @@ int php_oci_lob_write_tmp (php_oci_descriptor *descriptor, ub1 type, char *data, /* only these two are allowed */ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid temporary lob type: %d", type); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid temporary lob type: %ld", type); return 1; break; } @@ -921,7 +921,7 @@ int php_oci_lob_write_tmp (php_oci_descriptor *descriptor, ub1 type, char *data, lob, OCI_DEFAULT, OCI_DEFAULT, - type, + (ub1)type, OCI_ATTR_NOCACHE, OCI_DURATION_SESSION ) diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index bc83624180..b74b94e2a2 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -1480,7 +1480,7 @@ int php_oci_bind_array_by_name(php_oci_statement *statement, char *name, int nam name_len, (dvoid *) bindp->array.elements, (sb4) bind->array.max_length, - type, + (ub2)type, (dvoid *)bindp->array.indicators, (ub2 *)bind->array.element_lengths, (ub2 *)0, /* bindp->array.retcodes, */ diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index ba45260673..bef0fb9268 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -405,7 +405,7 @@ int php_oci_lob_get_buffering (php_oci_descriptor *); int php_oci_lob_copy (php_oci_descriptor *, php_oci_descriptor *, long TSRMLS_DC); int php_oci_lob_close (php_oci_descriptor * TSRMLS_DC); int php_oci_temp_lob_close (php_oci_descriptor * TSRMLS_DC); -int php_oci_lob_write_tmp (php_oci_descriptor *, ub1, char *, int TSRMLS_DC); +int php_oci_lob_write_tmp (php_oci_descriptor *, long, char *, int TSRMLS_DC); void php_oci_lob_free(php_oci_descriptor * TSRMLS_DC); 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); |