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

[simgrid.git] / teshsuite / simdag / platforms / flatifier.c

diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c
index 59f1ffe..7b3e375 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.c
+++ b/teshsuite/simdag/platforms/flatifier.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
            SD_workstation_get_name(hosts[i]),
            SD_workstation_get_power(hosts[i]));
     props = SD_workstation_get_properties(hosts[i]);
-    if (props && xbt_dict_length(props) > 0) {
+    if (props && !xbt_dict_is_empty(props)) {
       printf(">\n");
       xbt_dict_foreach(props, cursor, key, data) {
         printf("    <prop id=\"%s\" value=\"%s\"/>\n", key, data);
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
                  }
                  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
                  {
-                           if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+                           if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
                                printf("  <route src=\"%s\" dst=\"%s\">\n       "
                                          ,src
                                          ,dst);
@@ -169,10 +169,10 @@ int main(int argc, char **argv)
 
   xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
   {
-         if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
+         if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
                  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
                  {
-                               if(get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+                               if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
                                printf("  <route src=\"%s\" dst=\"%s\">\n       "
                                          ,src
                                          ,dst);