From: Christopher Jones Date: Wed, 18 Jul 2007 15:09:37 +0000 (+0000) Subject: Add casts to fix compilation warnings X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~70 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab25af8aeb02158daaa222081c1bd09966d90344;p=php Add casts to fix compilation warnings --- diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index a232ee9e20..6cd7f71c50 100644 --- 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'; @@ -930,14 +930,14 @@ sb4 php_oci_fetch_errmsg(OCIError *error_handle, text **error_buf TSRMLS_DC) UChar *tmp_buf; int tmp_buf_len; - err_buf_len = strlen(err_buf); + err_buf_len = strlen((char *)err_buf); if (err_buf_len && err_buf[err_buf_len - 1] == '\n') { err_buf[err_buf_len - 1] = '\0'; err_buf_len--; } - if (zend_string_to_unicode(UG(ascii_conv), &tmp_buf, &tmp_buf_len, err_buf, err_buf_len TSRMLS_CC) == SUCCESS) { + if (zend_string_to_unicode(UG(ascii_conv), &tmp_buf, &tmp_buf_len, (char *)err_buf, err_buf_len TSRMLS_CC) == SUCCESS) { *error_buf = (text *)eustrndup(tmp_buf, tmp_buf_len); efree(tmp_buf); } @@ -948,14 +948,14 @@ sb4 php_oci_fetch_errmsg(OCIError *error_handle, text **error_buf TSRMLS_DC) err_buf[UBYTES(err_buf_len - 1)] = '\0'; } } else { - err_buf_len = strlen(err_buf); + err_buf_len = strlen((char *)err_buf); if (err_buf_len && err_buf[err_buf_len - 1] == '\n') { err_buf[err_buf_len - 1] = '\0'; } } if (err_buf_len && error_buf) { - *error_buf = estrndup(err_buf, TEXT_BYTES(err_buf_len)); + *error_buf = (text *)estrndup((char *)err_buf, TEXT_BYTES(err_buf_len)); } } } @@ -1073,7 +1073,7 @@ php_oci_connection *php_oci_do_connect_ex(zstr username, int username_len, zstr #if HAVE_OCI_ENV_NLS_CREATE if (!UG(unicode)) { if (charset.s && *charset.s) { - PHP_OCI_CALL_RETURN(charsetid, OCINlsCharSetNameToId, (OCI_G(env), charset.s)); + PHP_OCI_CALL_RETURN(charsetid, OCINlsCharSetNameToId, (OCI_G(env), (CONST oratext *)charset.s)); if (!charsetid) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid character set name: %s", charset.s); } else { diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c index 30018105b5..6fbc5776d2 100644 --- 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, zstr date, in 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.s, TEXT_BYTES(date_len), NULL, 0, NULL, 0, &oci_date)); + PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)date.s, TEXT_BYTES(date_len), NULL, 0, NULL, 0, &oci_date)); if (connection->errcode != OCI_SUCCESS) { /* failed to convert string to date */ @@ -370,7 +370,7 @@ int php_oci_collection_append_string(php_oci_collection *collection, zstr elemen OCIString *ocistr = (OCIString *)0; php_oci_connection *connection = collection->connection; - PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, element.s, TEXT_BYTES(element_len), &ocistr)); + PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element.s, TEXT_BYTES(element_len), &ocistr)); if (connection->errcode != OCI_SUCCESS) { php_oci_error(connection->err, connection->errcode TSRMLS_CC); @@ -443,8 +443,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); @@ -492,7 +492,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, long index, z ZVAL_UNICODEL(*result_element, (UChar *)buff, TEXT_CHARS(buff_len), 1); /* Z_UNIVAL_P(*result_element)[buff_len] = 0; XXX */ } else { - 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'; } @@ -513,7 +513,7 @@ int php_oci_collection_element_get(php_oci_collection *collection, long index, z if (UG(unicode)) { ZVAL_UNICODEL(*result_element, (UChar *)str, TEXT_CHARS(str_len), 1); } else { - ZVAL_STRINGL(*result_element, str, str_len, 1); + ZVAL_STRINGL(*result_element, (char *)str, str_len, 1); } } return 0; @@ -583,7 +583,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.s, TEXT_BYTES(date_len), NULL, 0, NULL, 0, &oci_date)); + PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST oratext *)date.s, TEXT_BYTES(date_len), NULL, 0, NULL, 0, &oci_date)); if (connection->errcode != OCI_SUCCESS) { /* failed to convert string to date */ @@ -659,7 +659,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.s, TEXT_BYTES(element_len), &ocistr)); + PHP_OCI_CALL_RETURN(connection->errcode, OCIStringAssignText, (connection->env, connection->err, (CONST oratext *)element.s, TEXT_BYTES(element_len), &ocistr)); if (connection->errcode != OCI_SUCCESS) { php_oci_error(connection->err, connection->errcode TSRMLS_CC); diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c index ccd02f4812..34e34cbd02 100644 --- a/ext/oci8/oci8_lob.c +++ b/ext/oci8/oci8_lob.c @@ -677,7 +677,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]; @@ -700,9 +701,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 2d0ca4350b..7fb4e56a97 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -859,8 +859,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)); @@ -873,14 +873,14 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC) ZVAL_NULL(*entry); } else { zstr tmp; - tmp.s = buff; + tmp.s = (char *)buff; ZVAL_TEXTL(*entry, tmp, TEXT_CHARS(buff_len), 1); } zend_hash_move_forward(hash); } else { zstr tmp; PHP_OCI_CALL_RETURN(connection->errcode, OCIDateToText, (connection->err, &(((OCIDate *)(bind->array.elements))[i]), 0, 0, 0, 0, &buff_len, buff)); - tmp.s = buff; + tmp.s = (char *)buff; if (connection->errcode != OCI_SUCCESS) { php_oci_error(connection->err, connection->errcode TSRMLS_CC); add_next_index_null(bind->zval); @@ -907,13 +907,13 @@ int php_oci_bind_post_exec(void *data TSRMLS_DC) if (UG(unicode)) { tmp.u = ((UChar *)bind->array.elements)+TEXT_CHARS(i*bind->array.max_length); } else { - tmp.s = ((text *)bind->array.elements)+(i*bind->array.max_length); + tmp.s = (char *)(((text *)bind->array.elements)+(i*bind->array.max_length)); } ZVAL_TEXTL(*entry, tmp, curr_element_length, 1); zend_hash_move_forward(hash); } else { - tmp.s = ((text *)bind->array.elements)+(i*bind->array.max_length); + tmp.s = (char *)(((text *)bind->array.elements)+(i*bind->array.max_length)); add_next_index_textl(bind->zval, tmp, curr_element_length, 1); } } @@ -1623,9 +1623,9 @@ php_oci_bind *php_oci_bind_array_helper_date(zval* var, long max_table_length, p convert_to_text_ex(entry); if (UG(unicode)) { - PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (text *)Z_UNIVAL_PP(entry).s, UBYTES(Z_UNILEN_PP(entry)), NULL, 0, NULL, 0, &oci_date)); + PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)Z_UNIVAL_PP(entry).s, UBYTES(Z_UNILEN_PP(entry)), NULL, 0, NULL, 0, &oci_date)); } else { - 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) { @@ -1643,10 +1643,10 @@ php_oci_bind *php_oci_bind_array_helper_date(zval* var, long max_table_length, p if (UG(unicode)) { UChar *tmp = USTR_MAKE("01-JAN-00"); - PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (text *)tmp, UBYTES(sizeof("01-JAN-00")-1), NULL, 0, NULL, 0, &oci_date)); + PHP_OCI_CALL_RETURN(connection->errcode, OCIDateFromText, (connection->err, (CONST text *)tmp, UBYTES(sizeof("01-JAN-00")-1), NULL, 0, NULL, 0, &oci_date)); efree(tmp); } 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) {