Remove usage of xbt_assert[0-9].

[simgrid.git] / examples / msg / alias / masterslave_forwarder_with_alias.c

diff --git a/examples/msg/alias/masterslave_forwarder_with_alias.c b/examples/msg/alias/masterslave_forwarder_with_alias.c
index 807d775..6f4a70b 100644 (file)
--- a/examples/msg/alias/masterslave_forwarder_with_alias.c
+++ b/examples/msg/alias/masterslave_forwarder_with_alias.c
@@ -38,16 +38,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
+  int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[3]);
 
   {
     /*  Task creation */
@@ -116,7 +115,7 @@ int slave(int argc, char *argv[])
 
   while (1) {
     res = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
-    xbt_assert0(res == MSG_OK, "MSG_task_receive failed");
+    xbt_assert(res == MSG_OK, "MSG_task_receive failed");
 
     XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
 
@@ -180,7 +179,7 @@ int forwarder(int argc, char *argv[])
       i++;
     } else {
       XBT_INFO("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      xbt_die( "Unexpected behavior");
     }
   }