From a8f79b0fde64dc7e3d3e189d5a8c5c45a13f37c8 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@google.com>
Date: Wed, 10 Feb 2016 13:11:20 -0800
Subject: [PATCH] Revert "Added a switch to dump minidump modules in
 minidump_stackwalk."

This reverts commit cb936a0243c97ae9cd2d4bb19d95dde0421fed6d.

A=dyen@chromium.org
Original Review: https://codereview.chromium.org/1672773002/

R=dyen@chromium.org

Review URL: https://codereview.chromium.org/1688493003 .
---
 src/processor/minidump_stackwalk.cc | 25 +++++--------------------
 src/processor/stackwalk_common.cc   |  9 ---------
 src/processor/stackwalk_common.h    |  1 -
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc
index 05e3d3c0..8f83969f 100644
--- a/src/processor/minidump_stackwalk.cc
+++ b/src/processor/minidump_stackwalk.cc
@@ -71,8 +71,7 @@ using google_breakpad::scoped_ptr;
 bool PrintMinidumpProcess(const string &minidump_file,
                           const std::vector<string> &symbol_paths,
                           bool machine_readable,
-                          bool output_stack_contents,
-                          bool output_modules_only) {
+                          bool output_stack_contents) {
   scoped_ptr<SimpleSymbolSupplier> symbol_supplier;
   if (!symbol_paths.empty()) {
     // TODO(mmentovai): check existence of symbol_path if specified?
@@ -95,9 +94,7 @@ bool PrintMinidumpProcess(const string &minidump_file,
     return false;
   }
 
-  if (output_modules_only) {
-    PrintProcessModules(process_state);
-  } else if (machine_readable) {
+  if (machine_readable) {
     PrintProcessStateMachineReadable(process_state);
   } else {
     PrintProcessState(process_state, output_stack_contents, &resolver);
@@ -107,10 +104,9 @@ bool PrintMinidumpProcess(const string &minidump_file,
 }
 
 void usage(const char *program_name) {
-  fprintf(stderr, "usage: %s [-m|-s|-b] <minidump-file> [symbol-path ...]\n"
+  fprintf(stderr, "usage: %s [-m|-s] <minidump-file> [symbol-path ...]\n"
           "    -m : Output in machine-readable format\n"
-          "    -s : Output stack contents\n"
-          "    -b : Output contained full module paths\n",
+          "    -s : Output stack contents\n",
           program_name);
 }
 
@@ -127,7 +123,6 @@ int main(int argc, char **argv) {
   const char *minidump_file;
   bool machine_readable = false;
   bool output_stack_contents = false;
-  bool output_modules_only = false;
   int symbol_path_arg;
 
   if (strcmp(argv[1], "-m") == 0) {
@@ -148,15 +143,6 @@ int main(int argc, char **argv) {
     output_stack_contents = true;
     minidump_file = argv[2];
     symbol_path_arg = 3;
-  } else if (strcmp(argv[1], "-b") == 0) {
-    if (argc < 3) {
-      usage(argv[0]);
-      return 1;
-    }
-
-    output_modules_only = true;
-    minidump_file = argv[2];
-    symbol_path_arg = 3;
   } else {
     minidump_file = argv[1];
     symbol_path_arg = 2;
@@ -172,6 +158,5 @@ int main(int argc, char **argv) {
   return PrintMinidumpProcess(minidump_file,
                               symbol_paths,
                               machine_readable,
-                              output_stack_contents,
-                              output_modules_only) ? 0 : 1;
+                              output_stack_contents) ? 0 : 1;
 }
diff --git a/src/processor/stackwalk_common.cc b/src/processor/stackwalk_common.cc
index f5cf4802..20734fe0 100644
--- a/src/processor/stackwalk_common.cc
+++ b/src/processor/stackwalk_common.cc
@@ -926,13 +926,4 @@ void PrintProcessStateMachineReadable(const ProcessState& process_state) {
   }
 }
 
-void PrintProcessModules(const ProcessState& process_state) {
-  const CodeModules* modules = process_state.modules();
-  const unsigned int module_count = modules->module_count();
-  for (unsigned int i = 0; i < module_count; ++i) {
-    const CodeModule* module = modules->GetModuleAtSequence(i);
-    printf("%s\n", module->code_file().c_str());
-  }
-}
-
 }  // namespace google_breakpad
diff --git a/src/processor/stackwalk_common.h b/src/processor/stackwalk_common.h
index 8b32e1f3..a74f7b6d 100644
--- a/src/processor/stackwalk_common.h
+++ b/src/processor/stackwalk_common.h
@@ -43,7 +43,6 @@ void PrintProcessStateMachineReadable(const ProcessState& process_state);
 void PrintProcessState(const ProcessState& process_state,
                        bool output_stack_contents,
                        SourceLineResolverInterface* resolver);
-void PrintProcessModules(const ProcessState& process_state);
 
 }  // namespace google_breakpad