sixd                                     Wed, 10 Nov 2010 18:49:55 +0000

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

Log:
Fixed bug #53284 (Valgrind warnings in oci_set_* functions)

Bug: http://bugs.php.net/53284 (Assigned) Valgrind warnings in oci_set_* 
functions 
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c
    U   php/php-src/trunk/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      2010-11-10 
18:46:05 UTC (rev 305255)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c      2010-11-10 
18:49:55 UTC (rev 305256)
@@ -1719,7 +1719,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *client_id;
-       long client_id_len;
+       int client_id_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &client_id, &client_id_len) == FAILURE) {
                return;
@@ -1744,7 +1744,7 @@
 {
 #if ((OCI_MAJOR_VERSION > 11) || ((OCI_MAJOR_VERSION == 11) && 
(OCI_MINOR_VERSION >= 2)))
        char *edition;
-       long edition_len;
+       int edition_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &edition, 
&edition_len) == FAILURE) {
                return;
@@ -1777,7 +1777,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *module;
-       long module_len;
+       int module_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &module, &module_len) == FAILURE) {
                return;
@@ -1808,7 +1808,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *action;
-       long action_len;
+       int action_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &action, &action_len) == FAILURE) {
                return;
@@ -1839,7 +1839,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *client_info;
-       long client_info_len;
+       int client_info_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &client_info, &client_info_len) == FAILURE) {
                return;

Modified: php/php-src/trunk/ext/oci8/oci8_interface.c
===================================================================
--- php/php-src/trunk/ext/oci8/oci8_interface.c 2010-11-10 18:46:05 UTC (rev 
305255)
+++ php/php-src/trunk/ext/oci8/oci8_interface.c 2010-11-10 18:49:55 UTC (rev 
305256)
@@ -1715,7 +1715,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *client_id;
-       long client_id_len;
+       int client_id_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &client_id, &client_id_len) == FAILURE) {
                return;
@@ -1740,7 +1740,7 @@
 {
 #if ((OCI_MAJOR_VERSION > 11) || ((OCI_MAJOR_VERSION == 11) && 
(OCI_MINOR_VERSION >= 2)))
        char *edition;
-       long edition_len;
+       int edition_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &edition, 
&edition_len) == FAILURE) {
                return;
@@ -1773,7 +1773,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *module;
-       long module_len;
+       int module_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &module, &module_len) == FAILURE) {
                return;
@@ -1804,7 +1804,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *action;
-       long action_len;
+       int action_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &action, &action_len) == FAILURE) {
                return;
@@ -1835,7 +1835,7 @@
        zval *z_connection;
        php_oci_connection *connection;
        char *client_info;
-       long client_info_len;
+       int client_info_len;

        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", 
&z_connection, &client_info, &client_info_len) == FAILURE) {
                return;

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

Reply via email to