1 files changed, 7 insertions, 17 deletions
diff --git a/src/tools/wasm-objdump.cc b/src/tools/wasm-objdump.cc
index 3739da7d..47752dd5 100644
--- a/src/tools/wasm-objdump.cc
+++ b/src/tools/wasm-objdump.cc
@@ -74,9 +74,7 @@ static void ParseOptions(int argc, char** argv) {
 
 Result dump_file(const char* filename) {
   std::vector<uint8_t> file_data;
-  Result result = ReadFile(filename, &file_data);
-  if (Failed(result))
-    return result;
+  CHECK_RESULT(ReadFile(filename, &file_data));
 
   uint8_t* data = DataOrNull(file_data);
   size_t size = file_data.size();
@@ -91,42 +89,34 @@ Result dump_file(const char* filename) {
 
   // Pass 0: Prepass
   s_objdump_options.mode = ObjdumpMode::Prepass;
-  result = ReadBinaryObjdump(data, size, &s_objdump_options, &state);
-  if (Failed(result))
-    return result;
+  CHECK_RESULT(ReadBinaryObjdump(data, size, &s_objdump_options, &state));
   s_objdump_options.log_stream = nullptr;
 
   // Pass 1: Print the section headers
   if (s_objdump_options.headers) {
     s_objdump_options.mode = ObjdumpMode::Headers;
-    result = ReadBinaryObjdump(data, size, &s_objdump_options, &state);
-    if (Failed(result))
-      return result;
+    CHECK_RESULT(ReadBinaryObjdump(data, size, &s_objdump_options, &state));
   }
 
   // Pass 2: Print extra information based on section type
   if (s_objdump_options.details) {
     s_objdump_options.mode = ObjdumpMode::Details;
-    result = ReadBinaryObjdump(data, size, &s_objdump_options, &state);
-    if (Failed(result))
-      return result;
+    CHECK_RESULT(ReadBinaryObjdump(data, size, &s_objdump_options, &state));
   }
 
   // Pass 3: Disassemble code section
   if (s_objdump_options.disassemble) {
     s_objdump_options.mode = ObjdumpMode::Disassemble;
-    result = ReadBinaryObjdump(data, size, &s_objdump_options, &state);
-    if (Failed(result))
-      return result;
+    CHECK_RESULT(ReadBinaryObjdump(data, size, &s_objdump_options, &state));
   }
 
   // Pass 4: Dump to raw contents of the sections
   if (s_objdump_options.raw) {
     s_objdump_options.mode = ObjdumpMode::RawData;
-    result = ReadBinaryObjdump(data, size, &s_objdump_options, &state);
+    CHECK_RESULT(ReadBinaryObjdump(data, size, &s_objdump_options, &state));
   }
 
-  return result;
+  return Result::Ok;
 }
 
 int ProgramMain(int argc, char** argv) {