Oops this variable is twice declared.

[simgrid.git] / src / surf / surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index a077caa..3f576f5 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -150,8 +150,8 @@ static void generic_src_dst_check(routing_component_t rc, const char *src,
 /* **************************** GLOBAL FUNCTIONS **************************** */
 
 /* global parse functions */
-static char *src = NULL;        /* temporary store the source name of a route */
-static char *dst = NULL;        /* temporary store the destination name of a route */
+static const char *src = NULL;        /* temporary store the source name of a route */
+static const char *dst = NULL;        /* temporary store the destination name of a route */
 static char *gw_src = NULL;     /* temporary store the gateway source name of a route */
 static char *gw_dst = NULL;     /* temporary store the gateway destination name of a route */
 static xbt_dynar_t link_list = NULL;    /* temporary store of current list link of a route */
@@ -165,7 +165,7 @@ static void parse_S_host(char *host_id)
     current_routing->hierarchy = SURF_ROUTING_BASE;
   xbt_assert1(!xbt_dict_get_or_null
               (global_routing->where_network_elements, host_id),
-              "Reading a host, processing unit \"%s\" already exist",
+              "Reading a host, processing unit \"%s\" already exists",
               host_id);
   xbt_assert1(current_routing->set_processing_unit,
               "no defined method \"set_processing_unit\" in \"%s\"",
@@ -207,7 +207,7 @@ static void parse_S_router(void)
   xbt_assert1(!xbt_dict_get_or_null
               (global_routing->where_network_elements,
                A_surfxml_router_id),
-              "Reading a router, processing unit \"%s\" already exist",
+              "Reading a router, processing unit \"%s\" already exists",
               A_surfxml_router_id);
   xbt_assert1(current_routing->set_processing_unit,
               "no defined method \"set_processing_unit\" in \"%s\"",
@@ -227,7 +227,7 @@ static void parse_S_router(void)
 /**
  * \brief Set the endponints for a route
  */
-static void parse_S_route_new_and_endpoints(char *src_id, char *dst_id)
+static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
 {
   if (src != NULL && dst != NULL && link_list != NULL)
     THROW2(arg_error, 0, "Route between %s to %s can not be defined",
@@ -252,7 +252,7 @@ static void parse_S_route_new_and_endpoints_XML(void)
 /**
  * \breif Set the endpoints for a route from lua
  */
-static void parse_S_route_new_and_endpoints_lua(char *id_src, char *id_dst)
+static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
 {
   parse_S_route_new_and_endpoints(id_src, id_dst);
 }
@@ -429,7 +429,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing)
 
     xbt_assert1(!xbt_dict_get_or_null
                 (current_routing->routing_sons, AS_id),
-                "The AS \"%s\" already exist", AS_id);
+                "The AS \"%s\" already exists", AS_id);
     /* it is a part of the tree */
     new_routing->routing_father = current_routing;
     /* set the father behavior */
@@ -484,7 +484,7 @@ static void parse_E_AS(char *AS_id)
     network_element_info_t info = NULL;
     xbt_assert1(!xbt_dict_get_or_null
                 (global_routing->where_network_elements,
-                 current_routing->name), "The AS \"%s\" already exist",
+                 current_routing->name), "The AS \"%s\" already exists",
                 current_routing->name);
     info = xbt_new0(s_network_element_info_t, 1);
     info->rc_component = current_routing->routing_father;
@@ -1130,7 +1130,7 @@ static void model_full_set_route(routing_component_t rc, const char *src,
                          (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list,
                          (void*)link_route_to_test,
                          (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                         "The route between \"%s\" and \"%s\" already exist", src,dst);
+                         "The route between \"%s\" and \"%s\" already exists", src,dst);
                xbt_free(link_route_to_test);
        }
        else
@@ -1170,7 +1170,7 @@ static void model_full_set_route(routing_component_t rc, const char *src,
                                  (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list,
                              (void*)link_route_to_test,
                                  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                                 "The route between \"%s\" and \"%s\" already exist", src,dst);
+                                 "The route between \"%s\" and \"%s\" already exists", src,dst);
                        xbt_free(link_route_to_test);
                }
                else
@@ -1497,7 +1497,7 @@ static void model_floyd_set_route(routing_component_t rc, const char *src,
                          (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list,
                          (void*)link_route_to_test,
                          (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                         "The route between \"%s\" and \"%s\" already exist", src,dst);
+                         "The route between \"%s\" and \"%s\" already exists", src,dst);
                xbt_free(link_route_to_test);
        }
        else
@@ -1539,7 +1539,7 @@ static void model_floyd_set_route(routing_component_t rc, const char *src,
                                  (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
                              (void*)link_route_to_test,
                                  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                                 "The route between \"%s\" and \"%s\" already exist", src,dst);
+                                 "The route between \"%s\" and \"%s\" already exists", src,dst);
                        xbt_free(link_route_to_test);
                }
                else
@@ -2662,7 +2662,7 @@ static void generic_set_bypassroute(routing_component_t rc,
               "Invalid count of links, must be greater than zero (%s,%s)",
               src, dst);
   xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
-              "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
+              "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
               src, e_route->src_gateway, dst, e_route->dst_gateway);
 
   route_extended_t new_e_route =
@@ -3049,7 +3049,10 @@ static void routing_parse_Scluster(void)
   char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
   char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
   char *host_id, *groups, *link_id = NULL;
-  char *router_id, *link_router, *link_backbone, *route_src_dst;
+  char *router_id, *link_router, *link_backbone;
+#ifdef HAVE_PCRE_LIB
+  char *route_src_dst;
+#endif
   unsigned int iter;
   int start, end, i;
   xbt_dynar_t radical_elements;
@@ -3211,6 +3214,9 @@ static void routing_parse_Scluster(void)
   SURFXML_START_TAG(link);
   SURFXML_END_TAG(link);
 
+  DEBUG0(" ");
+
+#ifdef HAVE_PCRE_LIB
   char *new_suffix = bprintf("%s", "");
 
   radical_elements = xbt_str_split(cluster_suffix, ".");
@@ -3221,10 +3227,6 @@ static void routing_parse_Scluster(void)
   }
   route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix);
 
-  DEBUG0(" ");
-
-#ifdef HAVE_PCRE_LIB
-
   DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
   DEBUG0("symetrical=\"NO\">");
   SURFXML_BUFFER_SET(route_src, route_src_dst);
@@ -3378,7 +3380,7 @@ void routing_add_link(const char *link_id)
  */
 void routing_set_route(const char *src_id, const char *dst_id)
 {
-  parse_S_route_new_and_endpoints_lua((char *) src_id, (char *) dst_id);
+  parse_S_route_new_and_endpoints_lua(src_id, dst_id);
 }
 
 /*