com php-src: Quell GCC warning on mixing || and &&: ext/phar/phar.c
| From: | Levi Morrison | Date: | Sat, 11 Aug 2018 22:54:21 +0000 |
| Subject: | com php-src: Quell GCC warning on mixing || and &&: ext/phar/phar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102856@lists.php.net to get a copy of this message | ||
Commit: 29b56a878aa22310d645c3266110417e07ebe683
Author: Levi Morrison <levim@php.net> Sat, 11 Aug 2018 16:54:21 -0600
Parents: b151e17bdfca573e0205cc90dc710f89d77f03cf
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29b56a878aa22310d645c3266110417e07ebe683
Log:
Quell GCC warning on mixing || and &&
Changed paths:
M ext/phar/phar.c
Diff:
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index fd716b6..b3be34d 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1861,7 +1861,7 @@ static int phar_check_str(const char *fname, const char *ext_str, size_t
ext_len
pos = strstr(ext_str, ".phar");
if (!pos
- || pos != ext_str && (*(pos - 1) == '/')
+ || (pos != ext_str && (*(pos - 1) == '/'))
|| (ext_len - (pos - ext_str)) < 5
|| !(pos += 5)
|| !(*pos == '\0' || *pos == '/' || *pos == '.')) {