merge conflicts

[simgrid.git] / examples / msg / priority / priority.c

diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c
index 1a31157..48aaeaf 100644 (file)
--- a/examples/msg/priority/priority.c
+++ b/examples/msg/priority/priority.c
@@ -20,21 +20,20 @@ static int test(int argc, char *argv[])
   double priority = 1.0;
   m_task_t task = NULL;
 
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
+  xbt_assert(res, "Invalid argument %s\n", argv[1]);
+  res = sscanf(argv[2], "%lg", &priority);
+  xbt_assert(res, "Invalid argument %s\n", argv[2]);
 
-  xbt_assert1(sscanf(argv[1], "%lg", &computation_amount),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &priority),
-              "Invalid argument %s\n", argv[2]);
-
-  INFO2("Hello! Running a task of size %g with priority %g",
+  XBT_INFO("Hello! Running a task of size %g with priority %g",
         computation_amount, priority);
   task = MSG_task_create("Task", computation_amount, 0.0, NULL);
   MSG_task_set_priority(task, priority);
 
   MSG_task_execute(task);
+  MSG_task_destroy(task);
 
-
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   return 0;
 }
 
@@ -53,7 +52,7 @@ static MSG_error_t test_all(const char *platform_file,
   }
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }