Storage-kill: use right version number

[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 1739eb4..1c89668 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -143,63 +143,30 @@ FILE *surf_file_to_parse = nullptr;
 /* Stuff relative to storage */
 void STag_surfxml_storage()
 {
-  XBT_DEBUG("STag_surfxml_storage");
-  property_sets.push_back(new std::unordered_map<std::string, std::string>());
+  xbt_die("<storage> tag was removed in SimGrid v3.27. Please stop using it now.");
 }
 
 void ETag_surfxml_storage()
 {
-  simgrid::kernel::routing::StorageCreationArgs storage;
-
-  storage.properties = property_sets.back();
-  property_sets.pop_back();
-
-  storage.filename     = surf_parsed_filename;
-  storage.lineno       = surf_parse_lineno;
-  storage.id           = A_surfxml_storage_id;
-  storage.type_id      = A_surfxml_storage_typeId;
-  storage.content      = A_surfxml_storage_content;
-  storage.attach       = A_surfxml_storage_attach;
-
-  sg_platf_new_storage(&storage);
+  /* Won't happen since <storage> is now removed since v3.27. */
 }
 void STag_surfxml_storage___type()
 {
-  XBT_DEBUG("STag_surfxml_storage___type");
-  property_sets.push_back(new std::unordered_map<std::string, std::string>());
-  xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)");
+  xbt_die("<storage_type> tag was removed in SimGrid v3.27. Please stop using it now.");
 }
 void ETag_surfxml_storage___type()
 {
-  simgrid::kernel::routing::StorageTypeCreationArgs storage_type;
-
-  storage_type.properties = property_sets.back();
-  property_sets.pop_back();
-
-  storage_type.model_properties = current_model_property_set;
-  current_model_property_set    = nullptr;
-
-  storage_type.content = A_surfxml_storage___type_content;
-  storage_type.id      = A_surfxml_storage___type_id;
-  storage_type.model   = A_surfxml_storage___type_model;
-  storage_type.size =
-      static_cast<sg_size_t>(surf_parse_get_size(surf_parsed_filename, surf_parse_lineno, A_surfxml_storage___type_size,
-                                                 "size of storage type", storage_type.id.c_str()));
-  sg_platf_new_storage_type(&storage_type);
+  /* Won't happen since <storage_type> is now removed since v3.27. */
 }
 
 void STag_surfxml_mount()
 {
-  XBT_DEBUG("STag_surfxml_mount");
+  xbt_die("<mount> tag was removed in SimGrid v3.27. Please stop using it now.");
 }
 
 void ETag_surfxml_mount()
 {
-  simgrid::kernel::routing::MountCreationArgs mount;
-
-  mount.name      = A_surfxml_mount_name;
-  mount.storageId = A_surfxml_mount_storageId;
-  sg_platf_new_mount(&mount);
+  /* Won't happen since <mount> is now removed since v3.27. */
 }
 
 void STag_surfxml_include()
@@ -535,7 +502,7 @@ void STag_surfxml_link___ctn()
     surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
   }
 
-  const char* dirname = "";
+  const char* dirname;
   switch (A_surfxml_link___ctn_direction) {
     case A_surfxml_link___ctn_direction_UP:
       dirname = " (upward)";