gosh, this shitty code is even dupplicated!

diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp
index 837d770..d1e3350 100644 (file)
--- a/src/surf/surf_routing_dijkstra.cpp
+++ b/src/surf/surf_routing_dijkstra.cpp
@@ -378,8 +378,8 @@ AsDijkstra::AsDijkstra(const char*name, bool cached)
 
 void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
 {
 
 void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
 {

-  char *src = (char*)(route->src);
-  char *dst = (char*)(route->dst);
+  const char *src = route->src;
+  const char *dst = route->dst;

 
   int as_route = 0;
   if(!route->gw_dst && !route->gw_src)
 
   int as_route = 0;
   if(!route->gw_dst && !route->gw_src)


@@ -394,10 +394,8 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
       surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->name());
   }
 
       surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->name());
   }
 

-  NetCard *src_net_elm, *dst_net_elm;
-
-  src_net_elm = sg_netcard_by_name_or_null(src);
-  dst_net_elm = sg_netcard_by_name_or_null(dst);
+  NetCard *src_net_elm = sg_netcard_by_name_or_null(src);
+  NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst);

 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 48a6941..4036f0b 100644 (file)
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -134,17 +134,16 @@ static int floyd_pointer_resource_cmp(const void *a, const void *b) {
 
 void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
 {
 
 void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
 {

-  char *src = (char*)(route->src);
-  char *dst = (char*)(route->dst);
+  const char *src = route->src;
+  const char *dst = route->dst;

 
   int as_route = 0;
 
   /* set the size of table routing */
   int table_size = (int)xbt_dynar_length(vertices_);
 
   int as_route = 0;
 
   /* set the size of table routing */
   int table_size = (int)xbt_dynar_length(vertices_);

-  NetCard *src_net_elm, *dst_net_elm;

 
 

-  src_net_elm = sg_netcard_by_name_or_null(src);
-  dst_net_elm = sg_netcard_by_name_or_null(dst);
+  NetCard *src_net_elm = sg_netcard_by_name_or_null(src);
+  NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst);

 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);


@@ -213,13 +212,11 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
       if(!route->gw_dst && !route->gw_src)
         XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
       else
       if(!route->gw_dst && !route->gw_src)
         XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
       else

-        XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-            route->gw_src->name(), src, route->gw_dst->name());
+        XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->gw_src->name(), src, route->gw_dst->name());
+

       char * link_name;
       char * link_name;

-      unsigned int i;

       xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
       xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);

-      for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
-      {
+      for(int i=xbt_dynar_length(route->link_list) ;i>0 ;i--) {

         link_name = xbt_dynar_get_as(route->link_list,i-1,char *);
         void *link = Link::byName(link_name);
         xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
         link_name = xbt_dynar_get_as(route->link_list,i-1,char *);
         void *link = Link::byName(link_name);
         xbt_assert(link,"Link : '%s' doesn't exists.",link_name);

diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp
index bf8d6ba..84367d6 100644 (file)
--- a/src/surf/surf_routing_full.cpp
+++ b/src/surf/surf_routing_full.cpp
@@ -133,11 +133,11 @@ static int full_pointer_resource_cmp(const void *a, const void *b)
 void AsFull::parseRoute(sg_platf_route_cbarg_t route)
 {
   int as_route = 0;
 void AsFull::parseRoute(sg_platf_route_cbarg_t route)
 {
   int as_route = 0;

-  char *src = (char*)(route->src);
-  char *dst = (char*)(route->dst);
-  NetCard *src_net_elm, *dst_net_elm;
-  src_net_elm = sg_netcard_by_name_or_null(src);
-  dst_net_elm = sg_netcard_by_name_or_null(dst);
+
+  const char *src = route->src;
+  const char *dst = route->dst;
+  NetCard *src_net_elm = sg_netcard_by_name_or_null(src);
+  NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst);

 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);

diff --git a/src/surf/surfxml_parse.cpp b/src/surf/surfxml_parse.cpp
index 48710f3..59e99e8 100644 (file)
--- a/src/surf/surfxml_parse.cpp
+++ b/src/surf/surfxml_parse.cpp
@@ -54,7 +54,6 @@ double surf_parse_get_double(const char *string) {
   int ret = sscanf(string, "%lg", &res);
   if (ret != 1)
     surf_parse_error("%s is not a double", string);
   int ret = sscanf(string, "%lg", &res);
   if (ret != 1)
     surf_parse_error("%s is not a double", string);

-  //printf("Parsed double [%g] %s\n", res, string);

   return res;
 }
 
   return res;
 }