X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f13ab1807d381f0bf36027a9042e046dc4735dd5..846279ff21bca796cbd1eb12ace540ff5ad0abb6:/src/surf/network_ns3.c

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 31b26d5a81..7b4a54f718 100644
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -79,8 +79,7 @@ void parse_ns3_add_host(void)
 }
 
 static void ns3_free_dynar(void * elmts){
-	if(elmts)
-		free(elmts);
+	free(elmts);
 	return;
 }
 
@@ -324,10 +323,6 @@ static void define_callbacks_ns3(void)
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &parse_ns3_end_platform); //InitializeRoutes
 }
 
-static void free_ns3_elmts(void * elmts)
-{
-}
-
 static void free_ns3_link(void * elmts)
 {
 	ns3_link_t link = elmts;
@@ -490,7 +485,7 @@ static void ns3_update_actions_state(double now, double delta)
 	    }
 	  }
 
-	  while (xbt_dynar_length(socket_to_destroy)){
+	  while (!xbt_dynar_is_empty(socket_to_destroy)){
 	    xbt_dynar_pop(socket_to_destroy,&key);
 
 	    void *data = xbt_dict_get (dict_socket, key);
@@ -548,8 +543,7 @@ static int action_unref(surf_action_t action)
 #ifdef HAVE_TRACING
     xbt_free(((surf_action_network_ns3_t)action)->src_name);
     xbt_free(((surf_action_network_ns3_t)action)->dst_name);
-    if (action->category)
-      xbt_free(action->category);
+    xbt_free(action->category);
 #endif
     XBT_DEBUG ("Removing action %p", action);
     surf_action_free(&action);