fixup! Make parse_options_baset the owner of message_handler

Author: romainbrenguier

jbmc/src/janalyzer/janalyzer_parse_options.cpp

@@ -62,9 +62,7 @@ janalyzer_parse_optionst::janalyzer_parse_optionst(int argc, const char **argv)
       JANALYZER_OPTIONS,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("JANALYZER ") + CBMC_VERSION))
+      std::string("JANALYZER ") + CBMC_VERSION)
 {
 }
 

jbmc/src/jbmc/jbmc_parse_options.cpp

@@ -81,9 +81,7 @@ jbmc_parse_optionst::jbmc_parse_optionst(int argc, const char **argv)
       JBMC_OPTIONS,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("JBMC ") + CBMC_VERSION))
+      std::string("JBMC ") + CBMC_VERSION)
 {
 }
 
@@ -95,9 +93,7 @@ ::jbmc_parse_optionst::jbmc_parse_optionst(
       JBMC_OPTIONS + extra_options,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("JBMC ") + CBMC_VERSION))
+      std::string("JBMC ") + CBMC_VERSION)
 {
 }
 

jbmc/src/jdiff/jdiff_parse_options.cpp

@@ -66,9 +66,7 @@ jdiff_parse_optionst::jdiff_parse_optionst(int argc, const char **argv)
       JDIFF_OPTIONS,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("JDIFF ") + CBMC_VERSION))
+      std::string("JDIFF ") + CBMC_VERSION)
 {
 }
 

src/cbmc/cbmc_parse_options.cpp

@@ -87,9 +87,7 @@ cbmc_parse_optionst::cbmc_parse_optionst(int argc, const char **argv)
       CBMC_OPTIONS,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("CBMC ") + CBMC_VERSION)),
+      std::string("CBMC ") + CBMC_VERSION),
     xml_interfacet(cmdline)
 {
 }
@@ -102,9 +100,7 @@ ::cbmc_parse_optionst::cbmc_parse_optionst(
       CBMC_OPTIONS + extra_options,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("CBMC ") + CBMC_VERSION)),
+      std::string("CBMC ") + CBMC_VERSION),
     xml_interfacet(cmdline)
 {
 }

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -73,9 +73,7 @@ goto_analyzer_parse_optionst::goto_analyzer_parse_optionst(
       GOTO_ANALYSER_OPTIONS,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("GOTO-ANALYZER ") + CBMC_VERSION))
+      std::string("GOTO-ANALYZER "))
 {
 }
 

src/goto-diff/goto_diff_parse_options.cpp

@@ -68,9 +68,7 @@ goto_diff_parse_optionst::goto_diff_parse_optionst(int argc, const char **argv)
       GOTO_DIFF_OPTIONS,
       argc,
       argv,
-      util_make_unique<ui_message_handlert>(
-        cmdline,
-        std::string("GOTO-DIFF ") + CBMC_VERSION))
+      std::string("GOTO-DIFF ") + CBMC_VERSION)
 {
 }
 

src/goto-harness/goto_harness_parse_options.cpp

@@ -129,9 +129,7 @@ goto_harness_parse_optionst::goto_harness_parse_optionst(
   : parse_options_baset{GOTO_HARNESS_OPTIONS,
                         argc,
                         argv,
-                        util_make_unique<ui_message_handlert>(
-                          cmdline,
-                          std::string("GOTO-HARNESS ") + CBMC_VERSION)}
+                        std::string("GOTO-HARNESS ") + CBMC_VERSION}
 {
 }
 

src/goto-instrument/goto_instrument_parse_options.h

@@ -122,7 +122,7 @@ class goto_instrument_parse_optionst : public parse_options_baset
         GOTO_INSTRUMENT_OPTIONS,
         argc,
         argv,
-        util_make_unique<ui_message_handlert>(cmdline, "goto-instrument")),
+        "goto-instrument"),
       function_pointer_removal_done(false),
       partial_inlining_done(false),
       remove_returns_done(false)

src/util/parse_options.cpp

@@ -28,11 +28,12 @@ parse_options_baset::parse_options_baset(
   const std::string &_optstring,
   int argc,
   const char **argv,
-  std::unique_ptr<ui_message_handlert> mh)
-  : message_handler(std::move(mh)), log(*message_handler)
+  const std::string &program)
 {
   std::string optstring=std::string("?h(help)")+_optstring;
   parse_result=cmdline.parse(argc, argv, optstring.c_str());
+  message_handler = util_make_unique<ui_message_handlert>(cmdline, program);
+  log = messaget{*message_handler};
 }
 
 void parse_options_baset::help()

src/util/parse_options.h

@@ -24,7 +24,7 @@ class parse_options_baset
     const std::string &optstring,
     int argc,
     const char **argv,
-    std::unique_ptr<ui_message_handlert> mh);
+    const std::string &program);
 
   cmdlinet cmdline;