From: Reid Spencer <rspencer@reidspencer.com>
Date: Wed, 15 Dec 2004 21:58:03 +0000 (+0000)
Subject: Unbreak all archive reading operations introduced by the last patch which
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4ed7b0f809a4023a0e9f80f4530d59d357dc5ef;p=oota-llvm.git

Unbreak all archive reading operations introduced by the last patch which
always exited the program with exit code 1 in these cases, regardless of
whether an error occurred or not.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18966 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 586639bd631..1755e18413e 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -679,10 +679,11 @@ int main(int argc, char **argv) {
     } else {
       std::string Error;
       TheArchive = Archive::OpenAndLoad(ArchivePath, &Error);
-      if (TheArchive == 0)
+      if (TheArchive == 0) {
         std::cerr << argv[0] << ": error loading '" << ArchivePath << "': "
                   << Error << "!\n";
-      return 1;
+        return 1;
+      }
     }
 
     // Make sure we're not fooling ourselves.