X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8f9cd7d6db02b47ce8031dd1cb63a48775b6162..00ae4a50c96340ea9a1f097f4b26dc57b122a86e:/src/surf/platf_generator.c

diff --git a/src/surf/platf_generator.c b/src/surf/platf_generator.c
index 402ade6487..fadf745abb 100644
--- a/src/surf/platf_generator.c
+++ b/src/surf/platf_generator.c
@@ -1,4 +1,8 @@
+/* Copyright (c) 2012, 2014. The SimGrid Team.
+ * All rights reserved.                                                     */
 
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/platf_generator.h"
 #include "platf_generator_private.h"
@@ -631,8 +635,10 @@ void platf_generate(void) {
   surf_parse_init_callbacks();
   routing_register_callbacks();
 
-
-  sg_platf_new_AS_begin("random platform", A_surfxml_AS_routing_Floyd);
+  s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+  AS.id = "random platform";
+  AS.routing = A_surfxml_AS_routing_Floyd;
+  sg_platf_new_AS_begin(&AS);
 
   //Generate hosts, clusters and routers
   xbt_dynar_foreach(nodes, i, graph_node) {
@@ -664,6 +670,7 @@ void platf_generate(void) {
         node_data->router_id = bprintf("router-%d", ++last_router);
         router_parameters.id = node_data->router_id;
         sg_platf_new_router(&router_parameters);
+        break;
     }
   }
 
@@ -693,6 +700,7 @@ void platf_generate(void) {
         break;
       case HOST:
         route_parameters.src = src_data->host_parameters.id;
+        break;
     }
     switch(dst_data->kind) {
       case ROUTER:
@@ -703,6 +711,7 @@ void platf_generate(void) {
         break;
       case HOST:
         route_parameters.dst = dst_data->host_parameters.id;
+        break;
     }
     sg_platf_route_begin(&route_parameters);
     sg_platf_route_add_link(link_parameters->id, &route_parameters);