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 bee22d7..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 */
@@ -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);
 }
@@ -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;
@@ -3377,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);
 }
 
 /*