sixd                                     Thu, 01 Oct 2009 06:06:41 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289040

Log:
Eliminate type warnings. This change is not needed in other branches

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c

Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c      2009-10-01 
05:51:11 UTC (rev 289039)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c      2009-10-01 
06:06:41 UTC (rev 289040)
@@ -1584,7 +1584,7 @@
    Return the last error of stmt|connection|global. If no error happened 
returns false. */
 PHP_FUNCTION(oci_error)
 {
-       zval *arg;
+       zval *arg = NULL;
        php_oci_statement *statement;
        php_oci_connection *connection;
        text *errbuf;
@@ -1721,7 +1721,7 @@
 PHP_FUNCTION(oci_password_change)
 {
        zval *z_connection;
-       text *user, *pass_old, *pass_new, *dbname;
+       char *user, *pass_old, *pass_new, *dbname;
        int user_len, pass_old_len, pass_new_len, dbname_len;
        php_oci_connection *connection;

@@ -1747,7 +1747,7 @@
                        RETURN_FALSE;
                }

-               if (php_oci_password_change(connection, (char *)user, user_len, 
(char *)pass_old, pass_old_len, (char *)pass_new, pass_new_len TSRMLS_CC)) {
+               if (php_oci_password_change(connection, user, user_len, 
pass_old, pass_old_len, pass_new, pass_new_len TSRMLS_CC)) {
                        RETURN_FALSE;
                }
                RETURN_TRUE;
@@ -1766,7 +1766,7 @@
                        RETURN_FALSE;
                }

-               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);
+               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);
                if (!connection) {
                        RETURN_FALSE;
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to