Remove unnecessary uses of ""

Appending "" to a string has no effect.

Author: tautschnig

src/ansi-c/expr2c.cpp

@@ -479,9 +479,7 @@ std::string expr2ct::convert_rec(
 
     if(parameters.empty())
     {
-      if(code_type.has_ellipsis())
-        dest+=""; // empty!
-      else
+      if(!code_type.has_ellipsis())
         dest+="void"; // means 'no parameters'
     }
     else

src/cpp/parse.cpp

@@ -839,9 +839,8 @@ bool Parser::rNamespaceSpec(cpp_namespace_spect &namespace_spec)
 
   irep_idt name;
 
-  if(lex.LookAhead(0)=='{')
-    name=""; // an anonymous namespace
-  else
+  // namespace might be anonymous
+  if(lex.LookAhead(0) != '{')
   {
     if(lex.get_token(tk2)==TOK_IDENTIFIER)
       name=tk2.data.get(ID_C_base_name);

src/goto-instrument/dot.cpp

@@ -192,12 +192,12 @@ void dott::write_dot_subgraph(
       std::set<goto_programt::const_targett> fres;
       find_next(instructions, it, tres, fres);
 
-      std::string tlabel="true";
-      std::string flabel="false";
-      if(fres.empty() || tres.empty())
+      std::string tlabel;
+      std::string flabel;
+      if(!fres.empty() && !tres.empty())
       {
-        tlabel="";
-        flabel="";
+        tlabel = "true";
+        flabel = "false";
       }
 
       typedef std::set<goto_programt::const_targett> t;

src/goto-programs/property_checker.cpp

@@ -21,7 +21,7 @@ std::string property_checkert::as_string(resultt result)
   case property_checkert::resultt::UNKNOWN: return "UNKNOWN";
   }
 
-  return "";
+  UNREACHABLE;
 }
 
 property_checkert::property_checkert(

src/goto-symex/partial_order_concurrency.cpp

@@ -133,8 +133,6 @@ irep_idt partial_order_concurrencyt::rw_clock_id(
     return id2string(id(event))+"$rclk$"+std::to_string(axiom);
   else
     UNREACHABLE;
-
-  return "";
 }
 
 symbol_exprt partial_order_concurrencyt::clock(

src/pointer-analysis/value_set.cpp

@@ -181,7 +181,7 @@ void value_sett::output(const namespacet &ns, std::ostream &out) const
         result = "<" + from_expr(ns, identifier, o) + ", ";
 
         if(o_it->second)
-          result += integer2string(*o_it->second) + "";
+          result += integer2string(*o_it->second);
         else
           result += '*';
 

src/pointer-analysis/value_set_fi.cpp

@@ -102,7 +102,7 @@ void value_set_fit::output(
         result="<"+from_expr(ns, identifier, o)+", ";
 
         if(o_it->second)
-          result += integer2string(*o_it->second) + "";
+          result += integer2string(*o_it->second);
         else
           result+='*';
 

src/pointer-analysis/value_set_fivr.cpp

@@ -143,7 +143,7 @@ void value_set_fivrt::output(
         result+=from_expr(ns, identifier, o)+", ";
 
         if(o_it->second)
-          result += integer2string(*o_it->second) + "";
+          result += integer2string(*o_it->second);
         else
           result+='*';
 

src/pointer-analysis/value_set_fivrns.cpp

@@ -134,7 +134,7 @@ void value_set_fivrnst::output_entry(
       result+=from_expr(ns, identifier, o)+", ";
 
       if(o_it->second)
-        result += integer2string(*o_it->second) + "";
+        result += integer2string(*o_it->second);
       else
         result+='*';
 

src/solvers/smt2/smt2_conv.cpp

@@ -832,7 +832,6 @@ std::string smt2_convt::type2id(const typet &type) const
   else
   {
     UNREACHABLE;
-    return "";
   }
 }
 

src/solvers/strings/string_constraint_generator_format.cpp

@@ -79,6 +79,8 @@ class format_specifiert
 class format_textt
 {
 public:
+  format_textt() = default;
+
   explicit format_textt(std::string _content) : content(_content)
   {
   }
@@ -106,15 +108,15 @@ class format_elementt
     TEXT
   } format_typet;
 
-  explicit format_elementt(format_typet _type) : type(_type), fstring("")
+  explicit format_elementt(format_typet _type) : type(_type)
   {
   }
 
   explicit format_elementt(std::string s) : type(TEXT), fstring(s)
   {
   }
 
-  explicit format_elementt(format_specifiert fs) : type(SPECIFIER), fstring("")
+  explicit format_elementt(format_specifiert fs) : type(SPECIFIER)
   {
     fspec.push_back(fs);
   }
@@ -194,7 +196,7 @@ static bool check_format_string(std::string s)
 static format_specifiert format_specifier_of_match(std::smatch &m)
 {
   int index = m[1].str().empty() ? -1 : std::stoi(m[1].str());
-  std::string flag = m[2].str().empty() ? "" : m[2].str();
+  std::string flag = m[2].str();
   int width = m[3].str().empty() ? -1 : std::stoi(m[3].str());
   int precision = m[4].str().empty() ? -1 : std::stoi(m[4].str());
   std::string tT = m[5].str();

src/util/cmdline.cpp

@@ -46,13 +46,8 @@ std::string cmdlinet::get_value(char option) const
 {
   auto i=getoptnr(option);
 
-  if(i.has_value())
-  {
-    if(options[*i].values.empty())
-      return "";
-    else
-      return options[*i].values.front();
-  }
+  if(i.has_value() && !options[*i].values.empty())
+    return options[*i].values.front();
   else
     return "";
 }
@@ -96,13 +91,8 @@ std::string cmdlinet::get_value(const char *option) const
 {
   auto i=getoptnr(option);
 
-  if(i.has_value())
-  {
-    if(options[*i].values.empty())
-      return "";
-    else
-      return options[*i].values.front();
-  }
+  if(i.has_value() && !options[*i].values.empty())
+    return options[*i].values.front();
   else
     return "";
 }