cvs: php-src(PHP_5_3) /ext/phar phar_object.c
| From: | Greg Beaver | Date: | Sun, 31 Aug 2008 06:42:46 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52816@lists.php.net to get a copy of this message | ||
cellog Sun Aug 31 06:42:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
Log:
remove superfluous return statements, merge from pecl/phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.42&r2=1.266.2.43&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.42 php-src/ext/phar/phar_object.c:1.266.2.43
--- php-src/ext/phar/phar_object.c:1.266.2.42 Sun Aug 31 06:38:09 2008
+++ php-src/ext/phar/phar_object.c Sun Aug 31 06:42:46 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.42 2008/08/31 06:38:09 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.43 2008/08/31 06:42:46 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -4638,7 +4638,6 @@
case PHAR_ENT_COMPRESSED_GZ:
if (entry_obj->ent.entry->flags & PHAR_ENT_COMPRESSED_GZ) {
RETURN_TRUE;
- return;
}
if ((entry_obj->ent.entry->flags & PHAR_ENT_COMPRESSED_BZ2) != 0) {
@@ -4670,7 +4669,6 @@
case PHAR_ENT_COMPRESSED_BZ2:
if (entry_obj->ent.entry->flags & PHAR_ENT_COMPRESSED_BZ2) {
RETURN_TRUE;
- return;
}
if ((entry_obj->ent.entry->flags & PHAR_ENT_COMPRESSED_GZ) != 0) {
@@ -4732,7 +4730,6 @@
if ((entry_obj->ent.entry->flags & PHAR_ENT_COMPRESSION_MASK) == 0) {
RETURN_TRUE;
- return;
}
if (PHAR_G(readonly) && !entry_obj->ent.entry->phar->is_data) {