diff options
author | Davide Italiano <davide@freebsd.org> | 2015-11-14 19:00:33 +0000 |
---|---|---|
committer | Davide Italiano <davide@freebsd.org> | 2015-11-14 19:00:33 +0000 |
commit | 51ad607ad8bf88774f1f692aa1fea643af574860 (patch) | |
tree | 2ce23355c35cf633dd047e253f50997b61f45918 /tools/llvm-ar | |
parent | 8baf5a3c9207bd433424cfc4e4f1cb89bd8ad30c (diff) |
[llvm-ar] Use failIfError/fail helpers.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253141 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ar')
-rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index d60a1e2cf4a..ef5fab68b94 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -653,20 +653,13 @@ static int performOperation(ArchiveOperation Operation, ErrorOr<std::unique_ptr<MemoryBuffer>> Buf = MemoryBuffer::getFile(ArchiveName, -1, false); std::error_code EC = Buf.getError(); - if (EC && EC != errc::no_such_file_or_directory) { - errs() << ToolName << ": error opening '" << ArchiveName - << "': " << EC.message() << "!\n"; - return 1; - } + if (EC && EC != errc::no_such_file_or_directory) + fail("error opening '" + ArchiveName + "': " + EC.message() + "!"); if (!EC) { object::Archive Archive(Buf.get()->getMemBufferRef(), EC); - - if (EC) { - errs() << ToolName << ": error loading '" << ArchiveName - << "': " << EC.message() << "!\n"; - return 1; - } + failIfError(EC, + "error loading '" + ArchiveName + "': " + EC.message() + "!"); performOperation(Operation, &Archive, NewMembers); return 0; } |