useless cleanups

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 8a583d1..3064e7d 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -17,7 +17,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
 
 int NS3_EXTENSION_ID;
 
-xbt_dynar_t IPV4addr;
+xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free);
 static double time_to_next_flow_completion = -1;
 
 extern xbt_dict_t dict_socket;
@@ -37,11 +37,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
 {
   XBT_DEBUG("NS3_ADD_LINK '%s'",link->id);
 
-  if(!IPV4addr)
-    IPV4addr = xbt_dynar_new(sizeof(char*),free);
-
-  Link *l = surf_network_model->createLink(link->id, link->bandwidth, link->latency,
-      link->policy, link->properties);
+  Link *l = surf_network_model->createLink(link->id, link->bandwidth, link->latency, link->policy, link->properties);
   if (link->bandwidth_trace)
     l->setBandwidthTrace(link->latency_trace);
   if (link->latency_trace)
@@ -210,7 +206,7 @@ static void define_callbacks_ns3(void)
 {
   simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
   simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
-  simgrid::surf::on_link.connect (&parse_ns3_add_link);
+  simgrid::surf::on_link.connect (parse_ns3_add_link);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
   simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
   simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 1547bc6..4640bf0 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -20,8 +20,7 @@
 
 #include "src/surf/xml/platf_private.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
-                                "Logging specific to the SURF parsing module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf, "Logging specific to the SURF parsing module");
 #undef CLEANUP
 int ETag_surfxml_include_state(void);