show_goto_functions takes a ui_message_handler

This removes the need for passing a seperate ui argument.

Author: romainbrenguier

jbmc/src/janalyzer/janalyzer_parse_options.cpp

@@ -389,10 +389,7 @@ int janalyzer_parse_optionst::doit()
     cmdline.isset("list-goto-functions"))
   {
     show_goto_functions(
-      goto_model,
-      ui_message_handler,
-      ui_message_handler.get_ui(),
-      cmdline.isset("list-goto-functions"));
+      goto_model, ui_message_handler, cmdline.isset("list-goto-functions"));
     return CPROVER_EXIT_SUCCESS;
   }
 

jbmc/src/jbmc/jbmc_parse_options.cpp

@@ -797,10 +797,7 @@ int jbmc_parse_optionst::get_goto_program(
       cmdline.isset("list-goto-functions"))
     {
       show_goto_functions(
-        *goto_model,
-        ui_message_handler,
-        ui_message_handler.get_ui(),
-        cmdline.isset("list-goto-functions"));
+        *goto_model, ui_message_handler, cmdline.isset("list-goto-functions"));
       return 0;
     }
 
@@ -930,7 +927,6 @@ bool jbmc_parse_optionst::show_loaded_functions(
     show_goto_functions(
       ns,
       ui_message_handler,
-      ui_message_handler.get_ui(),
       goto_model.get_goto_functions(),
       cmdline.isset("list-goto-functions"));
     return true;

jbmc/src/jdiff/jdiff_parse_options.cpp

@@ -227,15 +227,9 @@ int jdiff_parse_optionst::doit()
     cmdline.isset("list-goto-functions"))
   {
     show_goto_functions(
-      goto_model1,
-      ui_message_handler,
-      ui_message_handler.get_ui(),
-      cmdline.isset("list-goto-functions"));
+      goto_model1, ui_message_handler, cmdline.isset("list-goto-functions"));
     show_goto_functions(
-      goto_model2,
-      ui_message_handler,
-      ui_message_handler.get_ui(),
-      cmdline.isset("list-goto-functions"));
+      goto_model2, ui_message_handler, cmdline.isset("list-goto-functions"));
     return CPROVER_EXIT_SUCCESS;
   }
 

src/cbmc/cbmc_parse_options.cpp

@@ -733,7 +733,6 @@ int cbmc_parse_optionst::get_goto_program(
       show_goto_functions(
         goto_model,
         ui_message_handler,
-        ui_message_handler.get_ui(),
         cmdline.isset("list-goto-functions"));
       return CPROVER_EXIT_SUCCESS;
     }

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -424,10 +424,7 @@ int goto_analyzer_parse_optionst::doit()
     cmdline.isset("list-goto-functions"))
   {
     show_goto_functions(
-      goto_model,
-      ui_message_handler,
-      ui_message_handler.get_ui(),
-      cmdline.isset("list-goto-functions"));
+      goto_model, ui_message_handler, cmdline.isset("list-goto-functions"));
     return CPROVER_EXIT_SUCCESS;
   }
 

src/goto-diff/goto_diff_parse_options.cpp

@@ -265,15 +265,9 @@ int goto_diff_parse_optionst::doit()
     cmdline.isset("list-goto-functions"))
   {
     show_goto_functions(
-      goto_model1,
-      ui_message_handler,
-      ui_message_handler.get_ui(),
-      cmdline.isset("list-goto-functions"));
+      goto_model1, ui_message_handler, cmdline.isset("list-goto-functions"));
     show_goto_functions(
-      goto_model2,
-      ui_message_handler,
-      ui_message_handler.get_ui(),
-      cmdline.isset("list-goto-functions"));
+      goto_model2, ui_message_handler, cmdline.isset("list-goto-functions"));
     return CPROVER_EXIT_SUCCESS;
   }
 

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -616,10 +616,7 @@ int goto_instrument_parse_optionst::doit()
       cmdline.isset("list-goto-functions"))
     {
       show_goto_functions(
-        goto_model,
-        ui_message_handler,
-        ui_message_handler.get_ui(),
-        cmdline.isset("list-goto-functions"));
+        goto_model, ui_message_handler, cmdline.isset("list-goto-functions"));
       return CPROVER_EXIT_SUCCESS;
     }
 

src/goto-programs/show_goto_functions.cpp

@@ -25,12 +25,12 @@ Author: Peter Schrammel
 
 void show_goto_functions(
   const namespacet &ns,
-  message_handlert &message_handler,
-  ui_message_handlert::uit ui,
+  ui_message_handlert &ui_message_handler,
   const goto_functionst &goto_functions,
   bool list_only)
 {
-  messaget msg(message_handler);
+  ui_message_handlert::uit ui = ui_message_handler.get_ui();
+  messaget msg(ui_message_handler);
   switch(ui)
   {
   case ui_message_handlert::uit::XML_UI:
@@ -82,11 +82,10 @@ void show_goto_functions(
 
 void show_goto_functions(
   const goto_modelt &goto_model,
-  message_handlert &message_handler,
-  ui_message_handlert::uit ui,
+  ui_message_handlert &ui_message_handler,
   bool list_only)
 {
   const namespacet ns(goto_model.symbol_table);
   show_goto_functions(
-    ns, message_handler, ui, goto_model.goto_functions, list_only);
+    ns, ui_message_handler, goto_model.goto_functions, list_only);
 }

src/goto-programs/show_goto_functions.h

@@ -30,15 +30,13 @@ class goto_functionst;
 
 void show_goto_functions(
   const namespacet &ns,
-  message_handlert &message_handler,
-  ui_message_handlert::uit ui,
+  ui_message_handlert &ui_message_handler,
   const goto_functionst &goto_functions,
-  bool list_only = false);
+  bool list_only);
 
 void show_goto_functions(
   const goto_modelt &,
-  message_handlert &message_handler,
-  ui_message_handlert::uit ui,
-  bool list_only = false);
+  ui_message_handlert &ui_message_handler,
+  bool list_only);
 
 #endif // CPROVER_GOTO_PROGRAMS_SHOW_GOTO_FUNCTIONS_H