diff options
| author | Kenny Root <kroot@google.com> | 2010-10-22 12:18:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 12:18:46 -0700 |
| commit | faf53c0bf2bd942cc06149364a5425396d958a23 (patch) | |
| tree | 0b1dbffb9a56ace1b15d250c82eea2315e50314a /cmds | |
| parent | 02482e205a9cae28c9f0b40492c24b777b26dbdc (diff) | |
| parent | 40763914e3c999a88e2c8254317bc1ac7196ed37 (diff) | |
| download | frameworks_base-faf53c0bf2bd942cc06149364a5425396d958a23.zip frameworks_base-faf53c0bf2bd942cc06149364a5425396d958a23.tar.gz frameworks_base-faf53c0bf2bd942cc06149364a5425396d958a23.tar.bz2 | |
am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ int linklib(const char* dataDir, const char* asecLibDir) 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; |