From b13edeb9b5032c85c0f51c6bbdd61d9aebf287c4 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Tue, 8 Dec 2015 02:45:59 +0000 Subject: [llvm-objdump/MachO] Don't cut'n'paste the same code over and over. Use the appropriate helper instead. llvm-svn: 254990 --- llvm/tools/llvm-objdump/MachODump.cpp | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'llvm/tools/llvm-objdump/MachODump.cpp') diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index b270057151e..61567436a1c 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -1495,11 +1495,8 @@ void llvm::ParseInputMachO(StringRef Filename) { printArchiveHeaders(A, !NonVerbose, ArchiveMemberOffsets); for (Archive::child_iterator I = A->child_begin(), E = A->child_end(); I != E; ++I) { - if (std::error_code EC = I->getError()) { - errs() << "llvm-objdump: '" << Filename << "': " << EC.message() - << ".\n"; - exit(1); - } + if (std::error_code EC = I->getError()) + report_error(Filename, EC); auto &C = I->get(); ErrorOr> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) @@ -1549,11 +1546,8 @@ void llvm::ParseInputMachO(StringRef Filename) { for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (std::error_code EC = AI->getError()) { - errs() << "llvm-objdump: '" << Filename - << "': " << EC.message() << ".\n"; - exit(1); - } + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); auto &C = AI->get(); ErrorOr> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) @@ -1597,11 +1591,8 @@ void llvm::ParseInputMachO(StringRef Filename) { for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (std::error_code EC = AI->getError()) { - errs() << "llvm-objdump: '" << Filename << "': " << EC.message() - << ".\n"; - exit(1); - } + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); auto &C = AI->get(); ErrorOr> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) @@ -1639,11 +1630,8 @@ void llvm::ParseInputMachO(StringRef Filename) { printArchiveHeaders(A.get(), !NonVerbose, ArchiveMemberOffsets); for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (std::error_code EC = AI->getError()) { - errs() << "llvm-objdump: '" << Filename << "': " << EC.message() - << ".\n"; - exit(1); - } + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); auto &C = AI->get(); ErrorOr> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) -- cgit v1.2.3