MFH: add casts to fix compilation warnings

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index ccfe6cd269bf42549ab3a11daf25f8c45ec2a9de..04d4f42a568e1c42278f94690ccf74c409a92b92 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -433,7 +433,7 @@ oci_error:
        OCIErrorGet(OCI_G(env), (ub4)1, NULL, &error_code, tmp_buf, (ub4)PHP_OCI_ERRBUF_LEN, (ub4)OCI_HTYPE_ERROR);
 
        if (error_code) {
-               int tmp_buf_len = strlen(tmp_buf);
+               int tmp_buf_len = strlen((char *)tmp_buf);
 
                if (tmp_buf_len > 0 && tmp_buf[tmp_buf_len - 1] == '\n') {
                        tmp_buf[tmp_buf_len - 1] = '\0';
@@ -922,14 +922,14 @@ sb4 php_oci_fetch_errmsg(OCIError *error_handle, text **error_buf TSRMLS_DC)
        PHP_OCI_CALL(OCIErrorGet, (error_handle, (ub4)1, NULL, &error_code, tmp_buf, (ub4)PHP_OCI_ERRBUF_LEN, (ub4)OCI_HTYPE_ERROR));
        
        if (error_code) {
-               int tmp_buf_len = strlen(tmp_buf);
+               int tmp_buf_len = strlen((char *)tmp_buf);
                
                if (tmp_buf_len && tmp_buf[tmp_buf_len - 1] == '\n') {
                        tmp_buf[tmp_buf_len - 1] = '\0';
                }
                if (tmp_buf_len && error_buf) {
                        *error_buf = NULL;
-                       *error_buf = estrndup(tmp_buf, tmp_buf_len);
+                       *error_buf = (text *)estrndup((char *)tmp_buf, tmp_buf_len);
                }
        }
        return error_code;
@@ -1041,7 +1041,7 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
 
 #if HAVE_OCI_ENV_NLS_CREATE
        if (charset && *charset) {
-               PHP_OCI_CALL_RETURN(charsetid, OCINlsCharSetNameToId, (OCI_G(env), charset));
+               PHP_OCI_CALL_RETURN(charsetid, OCINlsCharSetNameToId, (OCI_G(env), (CONST oratext *)charset));
                if (!charsetid) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid character set name: %s", charset);
                } else {

diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c
index c6613a4b7aa17e722bfc65130a066369f62d92e5..ed9037af78ee3219deeb3ae315180dd223ade881 100644 (file)
--- a/ext/oci8/oci8_collection.c
+++ b/ext/oci8/oci8_collection.c
@@ -296,7 +296,7 @@ int php_oci_collection_append_date(php_oci_collection *collection, char *date, i
        php_oci_connection *connection = collection->connection;
 
        /* format and language are NULLs, so format is "DD-MON-YY" and language is the default language of the session */
-       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, date, date_len, NULL, 0, NULL, 0, &oci_date));
+       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)date, date_len, NULL, 0, NULL, 0, &oci_date));
 
        if (connection->errcode != OCI_SUCCESS) {
                /* failed to convert string to date */
@@ -366,7 +366,7 @@ int php_oci_collection_append_string(php_oci_collection *collection, char *eleme
        OCIString *ocistr = (OCIString *)0;
        php_oci_connection *connection = collection->connection;
                        
-       PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, element, element_len, &ocistr));
+       PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element, element_len, &ocistr));
 
        if (connection->errcode != OCI_SUCCESS) {
                php_oci_error(connection->err, connection->errcode TSRMLS_CC);
@@ -439,8 +439,8 @@ int php_oci_collection_element_get(php_oci_collection *collection, long index, z
        dvoid *element;
        OCIInd *element_index;
        boolean exists;
-       char buff[1024];
-       int buff_len = 1024;
+       oratext buff[1024];
+       ub4 buff_len = 1024;
        
        MAKE_STD_ZVAL(*result_element);
        ZVAL_NULL(*result_element);
@@ -484,7 +484,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, long index, z
                                return 1;
                        }
 
-                       ZVAL_STRINGL(*result_element, buff, buff_len, 1);
+                       ZVAL_STRINGL(*result_element, (char *)buff, buff_len, 1);
                        Z_STRVAL_P(*result_element)[buff_len] = '\0';
                        
                        return 0;
@@ -498,7 +498,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, long index, z
                        PHP_OCI_CALL_RETURN(str, OCIStringPtr, (connection->env, oci_string));
                        
                        if (str) {
-                               ZVAL_STRING(*result_element, str, 1);
+                               ZVAL_STRING(*result_element, (char *)str, 1);
                        }
                        return 0;
                }
@@ -567,7 +567,7 @@ int php_oci_collection_element_set_date(php_oci_collection *collection, long ind
        php_oci_connection *connection = collection->connection;
 
        /* format and language are NULLs, so format is "DD-MON-YY" and language is the default language of the session */
-       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, date, date_len, NULL, 0, NULL, 0, &oci_date));
+       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)date, date_len, NULL, 0, NULL, 0, &oci_date));
 
        if (connection->errcode != OCI_SUCCESS) {
                /* failed to convert string to date */
@@ -639,7 +639,7 @@ int php_oci_collection_element_set_string(php_oci_collection *collection, long i
        OCIString *ocistr = (OCIString *)0;
        php_oci_connection *connection = collection->connection;
                        
-       PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, element, element_len, &ocistr));
+       PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element, element_len, &ocistr));
 
        if (connection->errcode != OCI_SUCCESS) {
                php_oci_error(connection->err, connection->errcode TSRMLS_CC);

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index a4416b3b295b43067ae2061d14d607db578931ad..427a88b7ecdd93e1adbb8d77c233d4645e206397 100644 (file)
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1715,7 +1715,7 @@ PHP_FUNCTION(oci_password_change)
                        RETURN_FALSE;
                }
 
-               if (php_oci_password_change(connection, user, user_len, pass_old, pass_old_len, pass_new, pass_new_len TSRMLS_CC)) {
+               if (php_oci_password_change(connection, (char *)user, user_len, (char *)pass_old, pass_old_len, (char *)pass_new, pass_new_len TSRMLS_CC)) {
                        RETURN_FALSE;
                }
                RETURN_TRUE;
@@ -1734,7 +1734,7 @@ PHP_FUNCTION(oci_password_change)
                        RETURN_FALSE;
                }
 
-               connection = php_oci_do_connect_ex(user, user_len, pass_old, pass_old_len, pass_new, pass_new_len, dbname, dbname_len, NULL, OCI_DEFAULT, 0, 0 TSRMLS_CC);
+               connection = php_oci_do_connect_ex((char *)user, user_len, (char *)pass_old, pass_old_len, (char *)pass_new, pass_new_len, (char *)dbname, dbname_len, NULL, OCI_DEFAULT, 0, 0 TSRMLS_CC);
                if (!connection) {
                        RETURN_FALSE;
                }

diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c
index 28b0f4e573ea3fda3e173cebe62c078bf3db7596..470b3b44882ce5f21a57d5ae0432d895af21fb54 100644 (file)
--- a/ext/oci8/oci8_lob.c
+++ b/ext/oci8/oci8_lob.c
@@ -672,7 +672,8 @@ void php_oci_lob_free (php_oci_descriptor *descriptor TSRMLS_DC)
  Import LOB contents from the given file */
 int php_oci_lob_import (php_oci_descriptor *descriptor, char *filename TSRMLS_DC)
 {
-       int fp, loblen;
+       int fp;
+       ub4 loblen;
        OCILobLocator *lob = (OCILobLocator *)descriptor->descriptor;
        php_oci_connection *connection = descriptor->connection;
        char buf[8192];
@@ -695,9 +696,9 @@ int php_oci_lob_import (php_oci_descriptor *descriptor, char *filename TSRMLS_DC
                                        connection->err, 
                                        lob, 
                                        &loblen, 
-                                       (ub4) offset, 
+                                       offset, 
                                        (dvoid *) &buf, 
-                                       (ub4) loblen, 
+                                       loblen, 
                                        OCI_ONE_PIECE, 
                                        (dvoid *)0, 
                                        (OCICallbackLobWrite) 0, 

diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index c28ca8216b1bf975ff21e0855358739d028cded7..947d7a29780bd157b42002446449d54badea1624 100644 (file)
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -838,8 +838,8 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC)
                                break;
                        case SQLT_ODT:
                                for (i = 0; i < bind->array.current_length; i++) {
-                                       char buff[1024];
-                                       int buff_len = 1024;
+                                       oratext buff[1024];
+                                       ub4 buff_len = 1024;
 
                                        memset((void*)buff,0,sizeof(buff));
                                                        
@@ -851,7 +851,7 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC)
                                                        php_oci_error(connection->err, connection->errcode TSRMLS_CC);
                                                        ZVAL_NULL(*entry);
                                                } else {
-                                                       ZVAL_STRINGL(*entry, buff, buff_len, 1);
+                                                       ZVAL_STRINGL(*entry, (char *)buff, buff_len, 1);
                                                }
                                                zend_hash_move_forward(hash);
                                        } else {
@@ -860,7 +860,7 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC)
                                                        php_oci_error(connection->err, connection->errcode TSRMLS_CC);
                                                        add_next_index_null(bind->zval);
                                                } else {
-                                                       add_next_index_stringl(bind->zval, buff, buff_len, 1);
+                                                       add_next_index_stringl(bind->zval, (char *)buff, buff_len, 1);
                                                }
                                        }
                                }
@@ -877,10 +877,10 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC)
                                        int curr_element_length = bind->array.element_lengths[i];
                                        if ((i < bind->array.old_length) && (zend_hash_get_current_data(hash, (void **) &entry) != FAILURE)) {
                                                zval_dtor(*entry);
-                                               ZVAL_STRINGL(*entry, ((text *)bind->array.elements)+i*bind->array.max_length, curr_element_length, 1);
+                                               ZVAL_STRINGL(*entry, (char *)(((text *)bind->array.elements)+i*bind->array.max_length), curr_element_length, 1);
                                                zend_hash_move_forward(hash);
                                        } else {
-                                               add_next_index_stringl(bind->zval, ((text *)bind->array.elements)+i*bind->array.max_length, curr_element_length, 1);
+                                               add_next_index_stringl(bind->zval, (char *)(((text *)bind->array.elements)+i*bind->array.max_length), curr_element_length, 1);
                                        }
                                }
                                break;
@@ -1553,7 +1553,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval* var, long max_table_length, p
                if ((i < bind->array.current_length) && (zend_hash_get_current_data(hash, (void **) &entry) != FAILURE)) {
                        
                        convert_to_string_ex(entry);
-                       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), NULL, 0, NULL, 0, &oci_date));
+                       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), NULL, 0, NULL, 0, &oci_date));
 
                        if (connection->errcode != OCI_SUCCESS) {
                                /* failed to convert string to date */
@@ -1567,7 +1567,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval* var, long max_table_length, p
                        ((OCIDate *)bind->array.elements)[i] = oci_date;
                        zend_hash_move_forward(hash);
                } else {
-                       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, "01-JAN-00", sizeof("01-JAN-00")-1, NULL, 0, NULL, 0, &oci_date));
+                       PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)"01-JAN-00", sizeof("01-JAN-00")-1, NULL, 0, NULL, 0, &oci_date));
 
                        if (connection->errcode != OCI_SUCCESS) {
                                /* failed to convert string to date */