[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/rand.c trunk/Zend/zend_compile.c trunk/ext/standard/rand.c

[Felipe Pena]

felipe                                   Tue, 23 Nov 2010 21:49:18 +0000

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

Log:
- Fixed compile warnings

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/rand.c
    U   php/php-src/trunk/Zend/zend_compile.c
    U   php/php-src/trunk/ext/standard/rand.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/rand.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/rand.c    2010-11-23 21:45:22 UTC 
(rev 305696)
+++ php/php-src/branches/PHP_5_3/ext/standard/rand.c    2010-11-23 21:49:18 UTC 
(rev 305697)
@@ -323,7 +323,7 @@
        }

        if (max < min) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%d) is smaller 
than min(%d)", max, min);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%ld) is 
smaller than min(%ld)", max, min);
                RETURN_FALSE;
        }


Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c       2010-11-23 21:45:22 UTC (rev 
305696)
+++ php/php-src/trunk/Zend/zend_compile.c       2010-11-23 21:49:18 UTC (rev 
305697)
@@ -3680,10 +3680,10 @@
        /* apply aliases which are qualified with a class name, there should 
not be any ambiguity */
        if (aliases) {
                while (aliases[i]) {
-                       if (!aliases[i]->trait_method->ce || fn->common.scope 
== aliases[i]->trait_method->ce &&
+                       if (!aliases[i]->trait_method->ce || (fn->common.scope 
== aliases[i]->trait_method->ce &&
                                
(zend_binary_strcasecmp(aliases[i]->trait_method->method_name,
                                  aliases[i]->trait_method->mname_len,
-                                 fn->common.function_name, fnname_len) == 0)) {
+                                 fn->common.function_name, fnname_len) == 0))) 
{
                                if (aliases[i]->alias) {
                                        fn_copy = *fn;
                                        
zend_traits_duplicate_function(&fn_copy, estrndup(aliases[i]->alias, 
aliases[i]->alias_len) TSRMLS_CC);

Modified: php/php-src/trunk/ext/standard/rand.c
===================================================================
--- php/php-src/trunk/ext/standard/rand.c       2010-11-23 21:45:22 UTC (rev 
305696)
+++ php/php-src/trunk/ext/standard/rand.c       2010-11-23 21:49:18 UTC (rev 
305697)
@@ -323,7 +323,7 @@
        }

        if (max < min) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%d) is smaller 
than min(%d)", max, min);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "max(%ld) is 
smaller than min(%ld)", max, min);
                RETURN_FALSE;
        }



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