remove superfluous return statements, merge from pecl/phar

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 4cd8c013ddfbe6d10d374cb3d49069b8ba5a75f2..24f871d7cda9f44044d3e95a35f996c6c351e1de 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -4638,7 +4638,6 @@ PHP_METHOD(PharFileInfo, compress)
                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 @@ PHP_METHOD(PharFileInfo, compress)
                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 @@ PHP_METHOD(PharFileInfo, decompress)
 
        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) {