diff options
Diffstat (limited to 'oatdump/oatdump.cc')
| -rw-r--r-- | oatdump/oatdump.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index b8b6a5f7c0..99140d4101 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -159,7 +159,7 @@ class OatSymbolizer FINAL { void WalkOatDexFile(const OatFile::OatDexFile* oat_dex_file, Callback callback) { std::string error_msg; - std::unique_ptr<const DexFile> dex_file(oat_dex_file->OpenDexFile(&error_msg)); + std::unique_ptr<const DexFile> dex_file(oat_dex_file->OpenDexFile(outof(error_msg))); if (dex_file.get() == nullptr) { return; } @@ -504,7 +504,7 @@ class OatDumper { const OatFile::OatDexFile* oat_dex_file = oat_dex_files_[i]; CHECK(oat_dex_file != nullptr); std::string error_msg; - std::unique_ptr<const DexFile> dex_file(oat_dex_file->OpenDexFile(&error_msg)); + std::unique_ptr<const DexFile> dex_file(oat_dex_file->OpenDexFile(outof(error_msg))); if (dex_file.get() == nullptr) { LOG(WARNING) << "Failed to open dex file '" << oat_dex_file->GetDexFileLocation() << "': " << error_msg; @@ -533,7 +533,7 @@ class OatDumper { const OatFile::OatDexFile* oat_dex_file = oat_dex_files_[i]; CHECK(oat_dex_file != nullptr); std::string error_msg; - std::unique_ptr<const DexFile> dex_file(oat_dex_file->OpenDexFile(&error_msg)); + std::unique_ptr<const DexFile> dex_file(oat_dex_file->OpenDexFile(outof(error_msg))); if (dex_file.get() == nullptr) { LOG(WARNING) << "Failed to open dex file '" << oat_dex_file->GetDexFileLocation() << "': " << error_msg; @@ -593,7 +593,7 @@ class OatDumper { // Create the verifier early. std::string error_msg; - std::unique_ptr<const DexFile> dex_file(oat_dex_file.OpenDexFile(&error_msg)); + std::unique_ptr<const DexFile> dex_file(oat_dex_file.OpenDexFile(outof(error_msg))); if (dex_file.get() == nullptr) { os << "NOT FOUND: " << error_msg << "\n\n"; os << std::flush; @@ -638,7 +638,7 @@ class OatDumper { std::string error_msg; std::string dex_file_location = oat_dex_file.GetDexFileLocation(); - std::unique_ptr<const DexFile> dex_file(oat_dex_file.OpenDexFile(&error_msg)); + std::unique_ptr<const DexFile> dex_file(oat_dex_file.OpenDexFile(outof(error_msg))); if (dex_file == nullptr) { os << "Failed to open dex file '" << dex_file_location << "': " << error_msg; return false; @@ -1553,7 +1553,7 @@ class ImageDumper { if (oat_file == nullptr) { oat_file = OatFile::Open(oat_location, oat_location, nullptr, nullptr, false, nullptr, - &error_msg); + outof(error_msg)); if (oat_file == nullptr) { os << "NOT FOUND: " << error_msg << "\n"; return false; @@ -2321,7 +2321,7 @@ static int DumpOatWithRuntime(Runtime* runtime, OatFile* oat_file, OatDumperOpti std::vector<std::unique_ptr<const DexFile>> dex_files; for (const OatFile::OatDexFile* odf : oat_file->GetOatDexFiles()) { std::string error_msg; - std::unique_ptr<const DexFile> dex_file = odf->OpenDexFile(&error_msg); + std::unique_ptr<const DexFile> dex_file = odf->OpenDexFile(outof(error_msg)); CHECK(dex_file != nullptr) << error_msg; class_linker->RegisterDexFile(*dex_file); dex_files.push_back(std::move(dex_file)); @@ -2361,7 +2361,7 @@ static int DumpOat(Runtime* runtime, const char* oat_filename, OatDumperOptions* std::ostream* os) { std::string error_msg; OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, nullptr, nullptr, false, - nullptr, &error_msg); + nullptr, outof(error_msg)); if (oat_file == nullptr) { fprintf(stderr, "Failed to open oat file from '%s': %s\n", oat_filename, error_msg.c_str()); return EXIT_FAILURE; @@ -2377,7 +2377,7 @@ static int DumpOat(Runtime* runtime, const char* oat_filename, OatDumperOptions* static int SymbolizeOat(const char* oat_filename, std::string& output_name) { std::string error_msg; OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, nullptr, nullptr, false, - nullptr, &error_msg); + nullptr, outof(error_msg)); if (oat_file == nullptr) { fprintf(stderr, "Failed to open oat file from '%s': %s\n", oat_filename, error_msg.c_str()); return EXIT_FAILURE; |