install: Remove jump label in really_install_packagecm-13.0

Commit acfc03463b ("sr: Add performance control") added a jump label
with the purpose of disabling performance mode before exiting the function.

That jump label now collides with a variable initialization from a
recent ASB commit (since jumping over a variable initialization
using jump labels is not allowed).

Instead, do what the 14.1 version of the commit did, and disable
performance mode manually on the two occasions where that is needed.

Change-Id: I5a55256f15895f673ec093da5d9a9f99875b70d8

1 files changed, 4 insertions, 5 deletions

diff --git a/install.cpp b/install.cpp
index f8a42836..fb5f7d0d 100644
--- a/install.cpp
+++ b/install.cpp
@@ -343,8 +343,8 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount)
     if (err != VERIFY_SUCCESS) {
         LOGE("signature verification failed\n");
         sysReleaseMap(&map);
-        ret = INSTALL_CORRUPT;
-        goto out;
+        set_perf_mode(false);
+        return INSTALL_CORRUPT;
     }
 
     /* Try to open the package.
@@ -354,8 +354,8 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount)
     if (err != 0) {
         LOGE("Can't open %s\n(%s)\n", path, err != -1 ? strerror(err) : "bad");
         sysReleaseMap(&map);
-        ret = INSTALL_CORRUPT;
-        goto out;
+        set_perf_mode(false);
+        return INSTALL_CORRUPT;
     }
 
     /* Verify and install the contents of the package.
@@ -379,7 +379,6 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount)
     }
 #endif /* USE_MDTP */
 
-out:
     set_perf_mode(false);
     return ret;
 }