coverage madness in examples

[simgrid.git] / examples / msg / properties / msg_prop.c

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index d460550..9417692 100644 (file)
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ msg_error_t test_all(const char *platform_file,
 
 static void test_host(const char*hostname) 
 {
-  msg_host_t thehost = MSG_get_host_by_name(hostname);
+  msg_host_t thehost = MSG_host_by_name(hostname);
   xbt_dict_t props = MSG_host_get_properties(thehost);
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
@@ -99,7 +99,7 @@ int bob(int argc, char *argv[])
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
   const char *noexist = "UnknownProcessProp";
-  _XBT_GNUC_UNUSED const char *value;
+  XBT_ATTRIB_UNUSED const char *value;
 
   XBT_INFO("== Print the properties of the process");
   xbt_dict_foreach(props, cursor, key, data)
@@ -156,15 +156,11 @@ int main(int argc, char *argv[])
   msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
-    exit(1);
-  }
-  res = test_all(argv[1], argv[2]);
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+                "\tExample: %s msg_platform.xml msg_deployment.xml\n", 
+                argv[0], argv[0]);
+ 
+   res = test_all(argv[1], argv[2]);
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}