[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/filter/logical_filters.c branches/PHP_5_4/ext/filter/logical_filters.c trunk/ext/filter/logical_filters.c

[Felipe Pena]

felipe                                   Tue, 24 May 2011 22:24:06 +0000

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

Log:
- Fixed bug #54912 (filter/logical_filters.c:685:32: warning: use of logical || 
with constant op)
  Initial patch by: crrodriguez at opensuse dot org

Bug: http://bugs.php.net/54912 (Open) filter/logical_filters.c:685:32: warning: 
use of logical || with constant op.
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/filter/logical_filters.c
    U   php/php-src/branches/PHP_5_4/ext/filter/logical_filters.c
    U   php/php-src/trunk/ext/filter/logical_filters.c

Modified: php/php-src/branches/PHP_5_3/ext/filter/logical_filters.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/filter/logical_filters.c   2011-05-24 
20:22:50 UTC (rev 311401)
+++ php/php-src/branches/PHP_5_3/ext/filter/logical_filters.c   2011-05-24 
22:24:06 UTC (rev 311402)
@@ -682,7 +682,7 @@
                RETURN_VALIDATION_FAILED
        }

-       if (flags & (FILTER_FLAG_IPV4 || FILTER_FLAG_IPV6)) {
+       if (flags & (FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {
                /* Both formats are cool */
        } else if ((flags & FILTER_FLAG_IPV4) && mode == FORMAT_IPV6) {
                RETURN_VALIDATION_FAILED

Modified: php/php-src/branches/PHP_5_4/ext/filter/logical_filters.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/filter/logical_filters.c   2011-05-24 
20:22:50 UTC (rev 311401)
+++ php/php-src/branches/PHP_5_4/ext/filter/logical_filters.c   2011-05-24 
22:24:06 UTC (rev 311402)
@@ -682,7 +682,7 @@
                RETURN_VALIDATION_FAILED
        }

-       if (flags & (FILTER_FLAG_IPV4 || FILTER_FLAG_IPV6)) {
+       if (flags & (FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {
                /* Both formats are cool */
        } else if ((flags & FILTER_FLAG_IPV4) && mode == FORMAT_IPV6) {
                RETURN_VALIDATION_FAILED

Modified: php/php-src/trunk/ext/filter/logical_filters.c
===================================================================
--- php/php-src/trunk/ext/filter/logical_filters.c      2011-05-24 20:22:50 UTC 
(rev 311401)
+++ php/php-src/trunk/ext/filter/logical_filters.c      2011-05-24 22:24:06 UTC 
(rev 311402)
@@ -682,7 +682,7 @@
                RETURN_VALIDATION_FAILED
        }

-       if (flags & (FILTER_FLAG_IPV4 || FILTER_FLAG_IPV6)) {
+       if (flags & (FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {
                /* Both formats are cool */
        } else if ((flags & FILTER_FLAG_IPV4) && mode == FORMAT_IPV6) {
                RETURN_VALIDATION_FAILED


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