Merge branch 'oldstyle_element_set'

[simgrid.git] / teshsuite / msg / get_sender / get_sender.c

diff --git a/teshsuite/msg/get_sender/get_sender.c b/teshsuite/msg/get_sender/get_sender.c
index 5774e91..592f13a 100644 (file)
--- a/teshsuite/msg/get_sender/get_sender.c
+++ b/teshsuite/msg/get_sender/get_sender.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2014. The SimGrid Team.
+/* Copyright (c) 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,7 +11,7 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific to this example");
 
 
-static int send(int argc, char *argv[])
+static int sender_fun(int argc, char *argv[])
 {
   XBT_INFO("Sending");
   MSG_task_send(MSG_task_create("Blah", 0.0, 0.0, NULL), MSG_host_get_name(MSG_host_self()));
@@ -20,7 +20,7 @@ static int send(int argc, char *argv[])
   return 0;
 }
 
-static int receive(int argc, char *argv[])
+static int receiver_fun(int argc, char *argv[])
 {
   XBT_INFO("Receiving");
   msg_task_t task = NULL;
@@ -40,15 +40,12 @@ int main(int argc, char *argv[])
   MSG_init(&argc, argv);
 
   /*   Application deployment */
-  MSG_function_register("send", &send);
-  MSG_function_register("receive", &receive);
+  MSG_function_register("send", &sender_fun);
+  MSG_function_register("receive", &receiver_fun);
 
   MSG_create_environment(argv[1]);
   MSG_launch_application(argv[2]);
   res = MSG_main();
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }