commit 95fb8396cad0f947f9d666c4c6b5a9fe4a39afde
author Kenny Root <kroot@google.com> Fri Oct 22 12:31:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 22 12:31:26 2010 -0700
tree 55e4f79fa1e9ba6dc808621c05c1080ffa7daf56
parent 22c4b8958d0e794c372ded884e21fe765db42e43
parent faf53c0bf2bd942cc06149364a5425396d958a23

am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index a5b3e0e..2f03c7a 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -946,14 +946,12 @@
     const size_t libdirLen = strlen(dataDir) + strlen(PKG_LIB_POSTFIX);
     if (libdirLen >= PKG_PATH_MAX) {
         LOGE("library dir len too large");
-        rc = -1;
-        goto out;
+        return -1;
     }
 
     if (snprintf(libdir, sizeof(libdir), "%s%s", dataDir, PKG_LIB_POSTFIX) != (ssize_t)libdirLen) {
         LOGE("library dir not written successfully: %s\n", strerror(errno));
-        rc = -1;
-        goto out;
+        return -1;
     }
 
     if (stat(dataDir, &s) < 0) return -1;