X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..2d16ebcee6bde01575b4cd88a853e1ac1c2532bf:/examples/msg/parallel_task/test_ptask.c

diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c
index 53ac24bf47..44175583ee 100644
--- a/examples/msg/parallel_task/test_ptask.c
+++ b/examples/msg/parallel_task/test_ptask.c
@@ -20,11 +20,6 @@ int redistribute(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file,
                      const char *application_file);
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 
 int execute(int argc, char *argv[])
 {
@@ -45,14 +40,15 @@ int execute(int argc, char *argv[])
   m_host_list = calloc(host_list_size, sizeof(m_host_t));
   for (i = 1; i <= host_list_size; i++) {
     m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
-    xbt_assert1(m_host_list[i - 1] != NULL,
+    xbt_assert(m_host_list[i - 1] != NULL,
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  xbt_assert1(sscanf(argv[argc - 2], "%lg", &computation_amount),
-              "Invalid argument %s\n", argv[argc - 2]);
-  xbt_assert1(sscanf(argv[argc - 1], "%lg", &communication_amount),
-              "Invalid argument %s\n", argv[argc - 1]);
+  _XBT_GNUC_UNUSED int read;
+  read = sscanf(argv[argc - 2], "%lg", &computation_amount);
+  xbt_assert(read, "Invalid argument %s\n", argv[argc - 2]);
+  read = sscanf(argv[argc - 1], "%lg", &communication_amount);
+  xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
   communication_table =
       (double *) calloc(host_list_size * host_list_size, sizeof(double));
@@ -100,12 +96,13 @@ int redistribute(int argc, char *argv[])
   m_host_list = calloc(host_list_size, sizeof(m_host_t));
   for (i = 1; i <= host_list_size; i++) {
     m_host_list[i - 1] = MSG_get_host_by_name(argv[i]);
-    xbt_assert1(m_host_list[i - 1] != NULL,
+    xbt_assert(m_host_list[i - 1] != NULL,
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  xbt_assert1(sscanf(argv[argc - 1], "%lg", &communication_amount),
-              "Invalid argument %s\n", argv[argc - 1]);
+  _XBT_GNUC_UNUSED int read;
+  read = sscanf(argv[argc - 1], "%lg", &communication_amount);
+  xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
   communication_table =
       (double *) calloc(host_list_size * host_list_size, sizeof(double));
@@ -143,7 +140,6 @@ MSG_error_t test_all(const char *platform_file,
   MSG_config("workstation/model", "ptask_L07");
 
   /*  Simulation setting */
-  MSG_set_channel_number(MAX_CHANNEL);
   MSG_create_environment(platform_file);
 
   /*   Application deployment */