sonar is picky, so let's be verbose

[simgrid.git] / src / surf / xml / surfxml_sax_cb.cpp

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index f747566..6aef8bb 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -426,15 +426,12 @@ int ETag_surfxml_include_state()
 
   // Yeah, we were in an <include> Restore state and proceed.
   fclose(surf_file_to_parse);
-  surf_file_to_parse = surf_file_to_parse_stack.back();
   surf_file_to_parse_stack.pop_back();
   surf_parse_pop_buffer_state();
-  surf_input_buffer = surf_input_buffer_stack.back();
   surf_input_buffer_stack.pop_back();
 
   // Restore the filename for error messages
   free(surf_parsed_filename);
-  surf_parsed_filename = surf_parsed_filename_stack.back();
   surf_parsed_filename_stack.pop_back();
 
   return 1;
@@ -692,7 +689,7 @@ void ETag_surfxml_link(){
 
 void STag_surfxml_link___ctn(){
 
-  simgrid::surf::LinkImpl* link;
+  simgrid::surf::LinkImpl* link = nullptr;
   char *link_name=nullptr;
   switch (A_surfxml_link___ctn_direction) {
   case AU_surfxml_link___ctn_direction:
@@ -710,10 +707,18 @@ void STag_surfxml_link___ctn(){
   }
   xbt_free(link_name); // no-op if it's already nullptr
 
-  surf_parse_assert(link!=nullptr,"No such link: '%s'%s", A_surfxml_link___ctn_id,
-      A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_UP?" (upward)":
-          ( A_surfxml_link___ctn_direction==A_surfxml_link___ctn_direction_DOWN?" (downward)":
-              ""));
+  const char* dirname = "";
+  switch (A_surfxml_link___ctn_direction) {
+    case A_surfxml_link___ctn_direction_UP:
+      dirname = " (upward)";
+      break;
+    case A_surfxml_link___ctn_direction_DOWN:
+      dirname = " (downward)";
+      break;
+    default:
+      dirname = "";
+  }
+  surf_parse_assert(link != nullptr, "No such link: '%s'%s", A_surfxml_link___ctn_id, dirname);
   parsed_link_list.push_back(link);
 }