Merge pull request #3341 from tautschnig/vs-show_goto_stack_trace

Daniel Kroening · web-flow · commit 98600509b533 · 2018-11-10T18:52:34.000Z
show_goto_stack_trace: remove unused parameter and make static [blocks: #2310]
diff --git a/src/goto-programs/goto_trace.cpp b/src/goto-programs/goto_trace.cpp
@@ -539,11 +539,10 @@ void show_full_goto_trace(
   }
 }
 
-void show_goto_stack_trace(
+static void show_goto_stack_trace(
   messaget::mstreamt &out,
   const namespacet &ns,
-  const goto_tracet &goto_trace,
-  const trace_optionst &options)
+  const goto_tracet &goto_trace)
 {
   // map from thread number to a call stack
   std::map<unsigned, std::vector<goto_tracet::stepst::const_iterator>>
@@ -622,7 +621,7 @@ void show_goto_trace(
   const trace_optionst &options)
 {
   if(options.stack_trace)
-    show_goto_stack_trace(out, ns, goto_trace, options);
+    show_goto_stack_trace(out, ns, goto_trace);
   else
     show_full_goto_trace(out, ns, goto_trace, options);
 }

Original file line number	Diff line number	Diff line change
`@@ -539,11 +539,10 @@ void show_full_goto_trace(`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`
`542`		`-void show_goto_stack_trace(`
	`542`	`+static void show_goto_stack_trace(`
`543`	`543`	`messaget::mstreamt &out,`
`544`	`544`	`const namespacet &ns,`
`545`		`- const goto_tracet &goto_trace,`
`546`		`- const trace_optionst &options)`
	`545`	`+ const goto_tracet &goto_trace)`
`547`	`546`	`{`
`548`	`547`	`// map from thread number to a call stack`
`549`	`548`	`std::map<unsigned, std::vector<goto_tracet::stepst::const_iterator>>`
`@@ -622,7 +621,7 @@ void show_goto_trace(`
`622`	`621`	`const trace_optionst &options)`
`623`	`622`	`{`
`624`	`623`	`if(options.stack_trace)`
`625`		`- show_goto_stack_trace(out, ns, goto_trace, options);`
	`624`	`+ show_goto_stack_trace(out, ns, goto_trace);`
`626`	`625`	`else`
`627`	`626`	`show_full_goto_trace(out, ns, goto_trace, options);`
`628`	`627`	`}`