From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 26 Feb 2019 20:34:27 +0000 (+0100)
Subject: surf_parse_error() never returns, remove dead code after that.
X-Git-Tag: v3_22~223
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e26a153e0ece22e44a1e05fca169114d935960df

surf_parse_error() never returns, remove dead code after that.
---

diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp
index b6974dc22e..c01781511a 100644
--- a/src/kernel/routing/FatTreeZone.cpp
+++ b/src/kernel/routing/FatTreeZone.cpp
@@ -247,7 +247,6 @@ void FatTreeZone::generate_switches()
     surf_parse_error(std::string("The number of provided nodes does not fit with the wanted topology.") +
                      " Please check your platform description (We need " + std::to_string(this->nodes_by_level_[0]) +
                      "nodes, we got " + std::to_string(this->nodes_.size()));
-    return;
   }
 
   for (unsigned int i = 0; i < this->levels_; i++) {
diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index b58cc69c24..739247afcf 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -55,7 +55,6 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs*
     default:
       surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
                        ": unknown kind of trace");
-      break;
   }
 }
 
diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 333c2e7f28..4465820a78 100644
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -88,7 +88,6 @@ double surf_parse_get_double(const std::string& s)
     return std::stod(s);
   } catch (std::invalid_argument& ia) {
     surf_parse_error(s + " is not a double");
-    return -1;
   }
 }
 
@@ -98,7 +97,6 @@ int surf_parse_get_int(const std::string& s)
     return std::stoi(s);
   } catch (std::invalid_argument& ia) {
     surf_parse_error(s + " is not a double");
-    return -1;
   }
 }
 
@@ -127,7 +125,6 @@ std::vector<int>* explodesRadical(const std::string& radicals)
         break;
       default:
         surf_parse_error(std::string("Malformed radical: ") + group);
-        break;
     }
     for (int i = start; i <= end; i++)
       exploded->push_back(i);
@@ -499,7 +496,6 @@ void ETag_surfxml_cluster(){
     break;
   default:
     surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
-    break;
   }
   cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
   cluster.router_id = A_surfxml_cluster_router___id;
@@ -520,7 +516,6 @@ void ETag_surfxml_cluster(){
     break;
   default:
     surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
-    break;
   }
   switch (AX_surfxml_cluster_bb___sharing___policy) {
   case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
@@ -531,7 +526,6 @@ void ETag_surfxml_cluster(){
     break;
   default:
     surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
-    break;
   }
 
   sg_platf_new_cluster(&cluster);
@@ -621,7 +615,6 @@ void ETag_surfxml_link(){
     break;
   default:
     surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
-    break;
   }
 
   sg_platf_new_link(&link);
@@ -643,7 +636,6 @@ void STag_surfxml_link___ctn()
     break;
   default:
     surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
-    break;
   }
 
   const char* dirname = "";
@@ -836,7 +828,6 @@ void STag_surfxml_trace___connect()
     break;
   default:
     surf_parse_error("Invalid trace kind");
-    break;
   }
   sg_platf_trace_connect(&trace_connect);
 }
@@ -950,7 +941,6 @@ void ETag_surfxml_actor()
     break;
   default:
     surf_parse_error("Invalid on failure behavior");
-    break;
   }
 
   sg_platf_new_actor(&actor);