X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e539420254a37bebe33ac9258c633d2dbe39b1ad..59823017c3f9f3dba0ef09292bb55ed9ab906254:/src/surf/surf_routing_cluster.c

diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c
index a054bba9e2..dc7fdbd415 100644
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -67,62 +67,61 @@ static void cluster_get_graph(xbt_graph_t graph, xbt_dict_t nodes,
   int isrc;
   int table_size = xbt_dynar_length(rc->index_network_elm);
 
-  sg_routing_edge_t src, dst;
-  xbt_node_t current, previous, backboneNode,routerNode;
+  sg_routing_edge_t src;
+  xbt_node_t current, previous, backboneNode = NULL, routerNode;
   s_surf_parsing_link_up_down_t info;
 
   xbt_assert(((as_cluster_t) rc)->router,"Malformed cluster");
 
   /* create the router */
   char *link_name =
-		  ((sg_routing_edge_t) ((as_cluster_t) rc)->router)->name;
+    ((sg_routing_edge_t) ((as_cluster_t) rc)->router)->name;
   routerNode = new_xbt_graph_node(graph, link_name, nodes);
 
   if(((as_cluster_t) rc)->backbone) {
-	  char *link_nameR =
-			  ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
-	  backboneNode = new_xbt_graph_node(graph, link_nameR, nodes);
+    char *link_nameR =
+      ((surf_resource_t) ((as_cluster_t) rc)->backbone)->name;
+    backboneNode = new_xbt_graph_node(graph, link_nameR, nodes);
 
-	  new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
+    new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
   }
 
   for (isrc = 0; isrc < table_size; isrc++) {
-	  src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
+    src = xbt_dynar_get_as(rc->index_network_elm, isrc, sg_routing_edge_t);
 
-	  if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {
-			  previous = new_xbt_graph_node(graph, src->name, nodes);
+    if (src->rc_type != SURF_NETWORK_ELEMENT_ROUTER) {
+      previous = new_xbt_graph_node(graph, src->name, nodes);
 
-			  info = xbt_dynar_get_as(rc->link_up_down_list, src->id,
-					  s_surf_parsing_link_up_down_t);
+      info = xbt_dynar_get_as(rc->link_up_down_list, src->id,
+                              s_surf_parsing_link_up_down_t);
 
-			  if (info.link_up) {     // link up
+      if (info.link_up) {     // link up
 
-				  char *link_name = ((surf_resource_t) info.link_up)->name;
-				  current = new_xbt_graph_node(graph, link_name, nodes);
-				  new_xbt_graph_edge(graph, previous, current, edges);
+        char *link_name = ((surf_resource_t) info.link_up)->name;
+        current = new_xbt_graph_node(graph, link_name, nodes);
+        new_xbt_graph_edge(graph, previous, current, edges);
 
-				  if (((as_cluster_t) rc)->backbone) {
-					  new_xbt_graph_edge(graph, current, backboneNode, edges);
-				  } else {
-					  new_xbt_graph_edge(graph, current, routerNode, edges);
-				  }
+        if (((as_cluster_t) rc)->backbone) {
+          new_xbt_graph_edge(graph, current, backboneNode, edges);
+        } else {
+          new_xbt_graph_edge(graph, current, routerNode, edges);
+        }
 
-			  }
+      }
 
-			  if (info.link_down) {    // link down
-				  char *link_name = ((surf_resource_t) info.link_down)->name;
-				  current = new_xbt_graph_node(graph, link_name, nodes);
-				  new_xbt_graph_edge(graph, previous, current, edges);
+      if (info.link_down) {    // link down
+        char *link_name = ((surf_resource_t) info.link_down)->name;
+        current = new_xbt_graph_node(graph, link_name, nodes);
+        new_xbt_graph_edge(graph, previous, current, edges);
 
-				  if (((as_cluster_t) rc)->backbone) {
-					  new_xbt_graph_edge(graph, current, backboneNode, edges);
-				  } else {
-					  new_xbt_graph_edge(graph, current, routerNode, edges);
-				  }
-
-			  }
-		  }
+        if (((as_cluster_t) rc)->backbone) {
+          new_xbt_graph_edge(graph, current, backboneNode, edges);
+        } else {
+          new_xbt_graph_edge(graph, current, routerNode, edges);
+        }
+    }
   }
+
 }
 
 static void model_cluster_finalize(AS_t as)