hide an ugly function used only locally

and also mark at its second location that its usage shouldn't be
dupplicated.

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index de758a1..adf4a2b 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -902,16 +902,6 @@ void generic_set_autonomous_system(routing_component_t rc, const char *name)
   xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
   xbt_dict_set(_to_index, name, id, xbt_free);
 }
 

-int surf_pointer_resource_cmp(const void *a, const void *b)
-{
-  return a != b;
-}
-
-int surf_link_resource_cmp(const void *a, const void *b)
-{
-  return ! !memcmp(a, b, global_routing->size_of_link);
-}
-

 void generic_set_bypassroute(routing_component_t rc,
                              const char *src, const char *dst,
                              route_extended_t e_route)
 void generic_set_bypassroute(routing_component_t rc,
                              const char *src, const char *dst,
                              route_extended_t e_route)

diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c
index 4b423e7..4bd883a 100644 (file)
--- a/src/surf/surf_routing_floyd.c
+++ b/src/surf/surf_routing_floyd.c
@@ -261,6 +261,12 @@ void model_floyd_end(void)
        }
 }
 
        }
 }
 

+static int surf_pointer_resource_cmp(const void *a, const void *b) {
+  return a != b;
+}
+
+//FIXME: kill dupplicates in next function with full routing
+

 void model_floyd_set_route(routing_component_t rc, const char *src,
         const char *dst, name_route_extended_t route)
 {
 void model_floyd_set_route(routing_component_t rc, const char *src,
         const char *dst, name_route_extended_t route)
 {

diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c
index 2e81d23..58fc09a 100644 (file)
--- a/src/surf/surf_routing_full.c
+++ b/src/surf/surf_routing_full.c
@@ -180,6 +180,10 @@ void model_full_end(void)
   }
 }
 
   }
 }
 

+static int surf_pointer_resource_cmp(const void *a, const void *b) {
+  return a != b;
+}
+

 void model_full_set_route(routing_component_t rc, const char *src,
                const char *dst, name_route_extended_t route)
 {
 void model_full_set_route(routing_component_t rc, const char *src,
                const char *dst, name_route_extended_t route)
 {

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 27d5204..d017ca1 100644 (file)
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -30,9 +30,6 @@ void generic_set_bypassroute(routing_component_t rc,
                                     const char *src, const char *dst,
                                     route_extended_t e_route);
 
                                     const char *src, const char *dst,
                                     route_extended_t e_route);
 

-int surf_link_resource_cmp(const void *a, const void *b);
-int surf_pointer_resource_cmp(const void *a, const void *b);
-

 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
 
 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */