X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..e045b97cdfe87a1f96a92fd26122fa4675667513:/examples/msg/masterslave/masterslave_forwarder.c

diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index efcb433585..5978b0e6a5 100644
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -39,12 +39,12 @@ int master(int argc, char *argv[])
 
   int i;
 
-  int res = sscanf(argv[1], "%d", &number_of_tasks);
-  xbt_assert1(res,"Invalid argument %s\n", argv[1]);
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert(res,"Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &task_comp_size);
-  xbt_assert1(res, "Invalid argument %s\n", argv[2]);
+  xbt_assert(res, "Invalid argument %s\n", argv[2]);
   res = sscanf(argv[3], "%lg", &task_comm_size);
-  xbt_assert1(res, "Invalid argument %s\n", argv[3]);
+  xbt_assert(res, "Invalid argument %s\n", argv[3]);
 
   {                             /*  Task creation */
     char sprintf_buffer[64];
@@ -65,7 +65,7 @@ int master(int argc, char *argv[])
 
     for (i = 4; i < argc; i++) {
       slaves[i - 4] = MSG_get_host_by_name(argv[i]);
-      xbt_assert1(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ",
+      xbt_assert(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ",
                   argv[i]);
     }
   }
@@ -103,10 +103,10 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   while (1) {
     res = MSG_task_get(&(task), PORT_22);
-    xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+    xbt_assert(res == MSG_OK, "MSG_task_get failed");
 
     XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
@@ -166,7 +166,7 @@ int forwarder(int argc, char *argv[])
       i++;
     } else {
       XBT_INFO("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      xbt_die("Unexpected behavior");
     }
   }
   xbt_free(slaves);