sixd Wed, 27 Jul 2011 00:04:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313754
Log:
Add explicit casts to remove some of Pierre's snapshot build warnings
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/oci8_lob.c
U php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c
U php/php-src/branches/PHP_5_3/ext/oci8/php_oci8_int.h
U php/php-src/trunk/ext/oci8/oci8_lob.c
U php/php-src/trunk/ext/oci8/oci8_statement.c
U php/php-src/trunk/ext/oci8/php_oci8_int.h
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8_lob.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8_lob.c 2011-07-26 23:58:18 UTC
(rev 313753)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_lob.c 2011-07-27 00:04:23 UTC
(rev 313754)
@@ -893,7 +893,7 @@
/* {{{ 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 @@
/* 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 @@
lob,
OCI_DEFAULT,
OCI_DEFAULT,
- type,
+ (ub1)type,
OCI_ATTR_NOCACHE,
OCI_DURATION_SESSION
)
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c 2011-07-26
23:58:18 UTC (rev 313753)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c 2011-07-27
00:04:23 UTC (rev 313754)
@@ -1480,7 +1480,7 @@
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, */
Modified: php/php-src/branches/PHP_5_3/ext/oci8/php_oci8_int.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/php_oci8_int.h 2011-07-26
23:58:18 UTC (rev 313753)
+++ php/php-src/branches/PHP_5_3/ext/oci8/php_oci8_int.h 2011-07-27
00:04:23 UTC (rev 313754)
@@ -405,7 +405,7 @@
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);
Modified: php/php-src/trunk/ext/oci8/oci8_lob.c
===================================================================
--- php/php-src/trunk/ext/oci8/oci8_lob.c 2011-07-26 23:58:18 UTC (rev
313753)
+++ php/php-src/trunk/ext/oci8/oci8_lob.c 2011-07-27 00:04:23 UTC (rev
313754)
@@ -893,7 +893,7 @@
/* {{{ 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 @@
/* 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 @@
lob,
OCI_DEFAULT,
OCI_DEFAULT,
- type,
+ (ub1)type,
OCI_ATTR_NOCACHE,
OCI_DURATION_SESSION
)
Modified: php/php-src/trunk/ext/oci8/oci8_statement.c
===================================================================
--- php/php-src/trunk/ext/oci8/oci8_statement.c 2011-07-26 23:58:18 UTC (rev
313753)
+++ php/php-src/trunk/ext/oci8/oci8_statement.c 2011-07-27 00:04:23 UTC (rev
313754)
@@ -1480,7 +1480,7 @@
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, */
Modified: php/php-src/trunk/ext/oci8/php_oci8_int.h
===================================================================
--- php/php-src/trunk/ext/oci8/php_oci8_int.h 2011-07-26 23:58:18 UTC (rev
313753)
+++ php/php-src/trunk/ext/oci8/php_oci8_int.h 2011-07-27 00:04:23 UTC (rev
313754)
@@ -405,7 +405,7 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
