Merge pull request diffblue#2464 from tautschnig/vs-unused1

Remove unused parameters message_handler, ns

Author: tautschnig

jbmc/src/janalyzer/janalyzer_parse_options.cpp

@@ -587,7 +587,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
     if(options.get_bool_option("show"))
     {
       result = static_show_domain(
-        goto_model, *analyzer, options, get_message_handler(), out);
+        goto_model, *analyzer, options, out);
     }
     else if(options.get_bool_option("verify"))
     {
@@ -602,17 +602,17 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
     else if(options.get_bool_option("unreachable-instructions"))
     {
       result = static_unreachable_instructions(
-        goto_model, *analyzer, options, get_message_handler(), out);
+        goto_model, *analyzer, options, out);
     }
     else if(options.get_bool_option("unreachable-functions"))
     {
       result = static_unreachable_functions(
-        goto_model, *analyzer, options, get_message_handler(), out);
+        goto_model, *analyzer, options, out);
     }
     else if(options.get_bool_option("reachable-functions"))
     {
       result = static_reachable_functions(
-        goto_model, *analyzer, options, get_message_handler(), out);
+        goto_model, *analyzer, options, out);
     }
     else
     {

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -628,7 +628,6 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
       result = static_show_domain(goto_model,
                                   *analyzer,
                                   options,
-                                  get_message_handler(),
                                   out);
     }
     else if(options.get_bool_option("verify"))
@@ -652,23 +651,20 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
       result = static_unreachable_instructions(goto_model,
                                                *analyzer,
                                                options,
-                                               get_message_handler(),
                                                out);
     }
     else if(options.get_bool_option("unreachable-functions"))
     {
       result = static_unreachable_functions(goto_model,
                                             *analyzer,
                                             options,
-                                            get_message_handler(),
                                             out);
     }
     else if(options.get_bool_option("reachable-functions"))
     {
       result = static_reachable_functions(goto_model,
                                           *analyzer,
                                           options,
-                                          get_message_handler(),
                                           out);
     }
     else

src/goto-analyzer/static_show_domain.cpp

@@ -16,14 +16,12 @@ Author: Martin Brain, [email protected]
 /// \param goto_model: the program analyzed
 /// \param ai: the abstract interpreter after it has been run to fix point
 /// \param options: the parsed user options
-/// \param message_handler: the system message handler
 /// \param out: output stream for the printing
 /// \return: false on success with the domain printed to out
 bool static_show_domain(
   const goto_modelt &goto_model,
   const ai_baset &ai,
   const optionst &options,
-  message_handlert &message_handler,
   std::ostream &out)
 {
   if(options.get_bool_option("json"))

src/goto-analyzer/static_show_domain.h

@@ -20,7 +20,6 @@ bool static_show_domain(
   const goto_modelt &,
   const ai_baset &,
   const optionst &,
-  message_handlert &,
   std::ostream &);
 
 #endif // CPROVER_GOTO_ANALYZER_STATIC_SHOW_DOMAIN_H

src/goto-analyzer/unreachable_instructions.cpp

@@ -84,7 +84,6 @@ static void output_dead_plain(
 }
 
 static void add_to_xml(
-  const namespacet &ns,
   const goto_programt &goto_program,
   const dead_mapt &dead_map,
   xmlt &dest)
@@ -206,7 +205,6 @@ bool static_unreachable_instructions(
   const goto_modelt &goto_model,
   const ai_baset &ai,
   const optionst &options,
-  message_handlert &message_handler,
   std::ostream &out)
 {
   json_arrayt json_result;
@@ -231,7 +229,7 @@ bool static_unreachable_instructions(
       }
       else if(options.get_bool_option("xml"))
       {
-        add_to_xml(ns, f_it->second.body, dead_map, xml_result);
+        add_to_xml(f_it->second.body, dead_map, xml_result);
       }
       else
       {
@@ -431,7 +429,6 @@ bool static_unreachable_functions(
   const goto_modelt &goto_model,
   const ai_baset &ai,
   const optionst &options,
-  message_handlert &message_handler,
   std::ostream &out)
 {
   std::unordered_set<irep_idt> called =
@@ -446,7 +443,6 @@ bool static_reachable_functions(
   const goto_modelt &goto_model,
   const ai_baset &ai,
   const optionst &options,
-  message_handlert &message_handler,
   std::ostream &out)
 {
   std::unordered_set<irep_idt> called =

src/goto-analyzer/unreachable_instructions.h

@@ -40,21 +40,18 @@ bool static_unreachable_instructions(
   const goto_modelt &,
   const ai_baset &,
   const optionst &,
-  message_handlert &,
   std::ostream &);
 
 bool static_unreachable_functions(
   const goto_modelt &,
   const ai_baset &,
   const optionst &,
-  message_handlert &,
   std::ostream &);
 
 bool static_reachable_functions(
   const goto_modelt &,
   const ai_baset &,
   const optionst &,
-  message_handlert &,
   std::ostream &);
 
 #endif // CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H