Fix, simplify, and reindent surf_*_resource_cmp functions.

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index eab5f6d..e16cdfc 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -243,7 +243,7 @@ static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_
 }
 
 /**
- * \breif Set the endpoints for a route from XML
+ * \brief Set the endpoints for a route from XML
  */
 static void parse_S_route_new_and_endpoints_XML(void)
 {
@@ -252,7 +252,7 @@ static void parse_S_route_new_and_endpoints_XML(void)
 }
 
 /**
- * \breif Set the endpoints for a route from lua
+ * \brief Set the endpoints for a route from lua
  */
 static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
 {
@@ -571,8 +571,8 @@ static xbt_dynar_t elements_father(const char *src, const char *dst)
   }
 
   /* (3) find the common father */
-  index_src = (path_src->used) - 1;
-  index_dst = (path_dst->used) - 1;
+  index_src = path_src->used - 1;
+  index_dst = path_dst->used - 1;
   current_src = xbt_dynar_get_ptr(path_src, index_src);
   current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
   while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) {
@@ -2243,9 +2243,9 @@ static void rule_route_free(void *e)
     xbt_dynar_free(&(*elem)->re_str_link);
     pcre_free((*elem)->re_src);
     pcre_free((*elem)->re_dst);
-    xbt_free((*elem));
+    xbt_free(*elem);
   }
-  (*elem) = NULL;
+  *elem = NULL;
 }
 
 static void rule_route_extended_free(void *e)
@@ -2257,7 +2257,7 @@ static void rule_route_extended_free(void *e)
     pcre_free((*elem)->generic_rule_route.re_dst);
     xbt_free((*elem)->re_src_gateway);
     xbt_free((*elem)->re_dst_gateway);
-    xbt_free((*elem));
+    xbt_free(*elem);
   }
 }
 
@@ -2774,16 +2774,14 @@ static void generic_set_autonomous_system(routing_component_t rc,
   xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
-static int surf_pointer_resource_cmp(const void *a, const void *b) {
-       if(a == b)
-               return 0;
-       return 1;
+static int surf_pointer_resource_cmp(const void *a, const void *b)
+{
+  return a != b;
 }
 
-static int surf_link_resource_cmp(const void *a, const void *b) {
-       if( memcmp(a,b,global_routing->size_of_link) == 0 );
-               return 0;
-       return 1;
+static int surf_link_resource_cmp(const void *a, const void *b)
+{
+  return !!memcmp(a,b,global_routing->size_of_link);
 }
 
 static void generic_set_bypassroute(routing_component_t rc,
@@ -2874,8 +2872,8 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
   }
 
   /* (3) find the common father */
-  index_src = (path_src->used) - 1;
-  index_dst = (path_dst->used) - 1;
+  index_src = path_src->used - 1;
+  index_dst = path_dst->used - 1;
   current_src = xbt_dynar_get_ptr(path_src, index_src);
   current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
   while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) {
@@ -2888,8 +2886,8 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
     current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
   }
 
-  int max_index_src = (path_src->used) - 1;
-  int max_index_dst = (path_dst->used) - 1;
+  int max_index_src = path_src->used - 1;
+  int max_index_dst = path_dst->used - 1;
 
   int max_index = max(max_index_src, max_index_dst);
   int i, max;