Merge pull request #1 from mquinson/master

[simgrid.git] / examples / msg / masterslave / masterslave_cluster.c

diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
index 4a7864b..8415bdb 100644 (file)
--- a/examples/msg/masterslave/masterslave_cluster.c
+++ b/examples/msg/masterslave/masterslave_cluster.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ int master(int argc, char *argv[])
   double task_comp_size = 0;
   double task_comm_size = 0;
   int i;
-  _XBT_GNUC_UNUSED int read;
+  XBT_ATTRIB_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &number_of_tasks);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
@@ -54,7 +54,7 @@ int master(int argc, char *argv[])
     }
   }
 
-  {                             /* Process organisation */
+  {                             /* Process organization */
     slaves_count = argc - 4;
     slaves = xbt_new0(msg_host_t, slaves_count);
 
@@ -221,8 +221,5 @@ int main(int argc, char *argv[])
   MSG_init(&argc, argv);
   res = test_all(argv[1]);
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}