Merge remote-tracking branch 'origin/master'

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

diff --git a/examples/msg/masterslave/masterslave_kill.c b/examples/msg/masterslave/masterslave_kill.c
index ae4a14d..bc0a2dc 100644 (file)
--- a/examples/msg/masterslave/masterslave_kill.c
+++ b/examples/msg/masterslave/masterslave_kill.c
@@ -26,7 +26,7 @@ static int slave(int argc, char *argv[])
 
 static int master(int argc, char *argv[])
 {
-  m_process_t bob = NULL;
+  msg_process_t bob = NULL;
 
   XBT_INFO("Hello!");
   bob = MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("bob"));
@@ -43,10 +43,10 @@ static int master(int argc, char *argv[])
 }                               /* end_of_dram_master */
 
 /** Test function */
-static MSG_error_t test_all(const char *platform_file,
+static msg_error_t test_all(const char *platform_file,
                             const char *application_file)
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   MSG_create_environment(platform_file);
   MSG_function_register("master", master);
@@ -63,7 +63,7 @@ static MSG_error_t test_all(const char *platform_file,
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
   if (argc < 3) {
@@ -73,7 +73,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
   test_all(argv[1], argv[2]);
-  res = MSG_clean();
 
   if (res == MSG_OK)
     return 0;