cleanups in teshsuite/simdag/platforms, don't ask why

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

diff --git a/teshsuite/simdag/platforms/is_router_test.c b/teshsuite/simdag/platforms/is_router_test.c
index 5014b76..cb89fab 100644 (file)
--- a/teshsuite/simdag/platforms/is_router_test.c
+++ b/teshsuite/simdag/platforms/is_router_test.c
@@ -6,9 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "src/surf/surf_private.h"
-
-extern routing_platf_t routing_platf;
+#include "simgrid/simdag.h"
+#include "surf/surf.h"
 
 int main(int argc, char **argv)
 {
@@ -17,11 +16,6 @@ int main(int argc, char **argv)
   xbt_lib_cursor_t cursor = NULL;
   char *key, *data;
 
-#ifdef _XBT_WIN32
-  setbuf(stderr, NULL);
-  setbuf(stdout, NULL);
-#endif
-
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -29,18 +23,13 @@ int main(int argc, char **argv)
 
   size = xbt_dict_length(host_list) + xbt_lib_length(as_router_lib);
 
-  printf("Workstation number: %d, link number: %d, elmts number: %d\n",
-         SD_workstation_get_count(), sg_link_count(), size);
+  printf("Workstation number: %zu, link number: %d, elmts number: %d\n", sg_host_count(), sg_link_count(), size);
 
-  xbt_dict_foreach(host_list, cursor, key, data) {
-    printf("   - Seen: \"%s\" is type : %d\n", key,
-           (int) routing_get_network_element_type(key));
-  }
+  xbt_dict_foreach(host_list, cursor, key, data)
+    printf("   - Seen: \"%s\" is type : %d\n", key, (int) routing_get_network_element_type(key));
 
-  xbt_lib_foreach(as_router_lib, cursor, key, data) {
-    printf("   - Seen: \"%s\" is type : %d\n", key,
-           (int) routing_get_network_element_type(key));
-  }
+  xbt_lib_foreach(as_router_lib, cursor, key, data)
+    printf("   - Seen: \"%s\" is type : %d\n", key, (int) routing_get_network_element_type(key));
 
   SD_exit();
   return 0;