Use xbt_XXX_is_empty() instead of testing xbt_XXX_length() against 0.

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

diff --git a/src/surf/surf_routing_rulebased.c b/src/surf/surf_routing_rulebased.c
index 6e7a605babbf1038d386cdd65cb0d85e12a5ed2e..110c28822ad190dcebb799756c0e820b53d5a1c9 100644 (file)
--- a/src/surf/surf_routing_rulebased.c
+++ b/src/surf/surf_routing_rulebased.c
@@ -92,8 +92,8 @@ static void model_rulebased_parse_route(AS_t rc,
   const char *error;
   int erroffset;
 
-  if(!strcmp(rc->routing->name,"Vivaldi")){
-         if(xbt_dynar_length(route->generic_route.link_list) != 0)
+  if(!strcmp(rc->model_desc->name,"Vivaldi")){
+         if(!xbt_dynar_is_empty(route->generic_route.link_list))
                  xbt_die("You can't have link_ctn with Model Vivaldi.");
   }
 
@@ -120,8 +120,8 @@ static void model_rulebased_parse_ASroute(AS_t rc,
   const char *error;
   int erroffset;
 
-  if(!strcmp(rc->routing->name,"Vivaldi")){
-         if(xbt_dynar_length(route->generic_route.link_list) != 0)
+  if(!strcmp(rc->model_desc->name,"Vivaldi")){
+         if(!xbt_dynar_is_empty(route->generic_route.link_list))
                  xbt_die("You can't have link_ctn with Model Vivaldi.");
   }
 
@@ -230,7 +230,7 @@ static xbt_dynar_t rulebased_get_onelink_routes(AS_t rc)
   //find router
   char *router = NULL;
   xbt_dict_foreach(routing->dict_processing_units, c1, k1, d1) {
-    if (rc->get_network_element_type(k1) == SURF_NETWORK_ELEMENT_ROUTER){
+    if (routing_get_network_element_type(k1) == SURF_NETWORK_ELEMENT_ROUTER){
       router = k1;
     }
   }
@@ -395,7 +395,7 @@ static void rulebased_finalize(AS_t rc)
 AS_t model_rulebased_create(void) {
 
   routing_component_rulebased_t new_component = (routing_component_rulebased_t)
-      routmod_generic_create(sizeof(s_routing_component_rulebased_t));
+      model_generic_create_sized(sizeof(s_routing_component_rulebased_t));
 
   new_component->generic_routing.parse_PU = model_rulebased_parse_PU;
   new_component->generic_routing.parse_AS = model_rulebased_parse_AS;