Fix other tests

Author: Petr Bauch

regression/goto-instrument/fp-reachability-slice3/test.desc

@@ -6,5 +6,4 @@ main.c
 --
 ^warning: ignoring
 dead d;
-dead e;
 dead f;

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -1436,7 +1436,7 @@ void goto_instrument_parse_optionst::instrument_goto_program()
 
     status() << "Performing a function pointer reachability slice" << eom;
     function_path_reachability_slicer(
-      goto_model, cmdline.get_values("fp-reachability-slice"));
+      goto_model, cmdline.get_value("fp-reachability-slice"));
   }
 
   // full slice?

src/goto-instrument/reachability_slicer.cpp

@@ -250,12 +250,15 @@ void reachability_slicer(
 /// starting from these functions will be kept.
 void function_path_reachability_slicer(
   goto_modelt &goto_model,
-  const std::list<std::string> &functions)
+  const std::string &functions_list)
 {
   reachability_slicert s;
-  for(const auto &function : functions)
+
+  std::istringstream multiple_functions(functions_list);
+  std::string single_function;
+  while(std::getline(multiple_functions, single_function, ','))
   {
-    in_function_criteriont p(function);
+    in_function_criteriont p(single_function);
     s(goto_model.goto_functions, p, true);
   }
 

src/goto-instrument/reachability_slicer.h

@@ -25,7 +25,7 @@ void reachability_slicer(
 
 void function_path_reachability_slicer(
   goto_modelt &goto_model,
-  const std::list<std::string> &function);
+  const std::string &functions_list);
 
 void reachability_slicer(
   goto_modelt &,

src/util/cmdline.cpp

@@ -224,18 +224,6 @@ bool cmdlinet::parse(int argc, const char **argv, const char *optstring)
         }
         else
           options[*optnr].values.push_back(argv[i]+2);
-
-        auto &my_values = options[*optnr].values;
-        if(my_values.back().find(',') != std::string::npos)
-        {
-          std::istringstream multiple_values(my_values.back());
-          my_values.pop_back();
-          std::string single_value;
-          while(std::getline(multiple_values, single_value, ','))
-          {
-            my_values.push_back(single_value);
-          }
-        }
       }
     }
   }