X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370..b65614d53e1cba701db0f7902da139f98bb49a1a:/examples/msg/masterslave/masterslave_console.c

diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index 6a1aec97d8..d49df00eea 100644
--- a/examples/msg/masterslave/masterslave_console.c
+++ b/examples/msg/masterslave/masterslave_console.c
@@ -26,7 +26,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
-MSG_error_t test_all(const char *);
+msg_error_t test_all(const char *);
 
 /** Emitter function  */
 int master(int argc, char *argv[])
@@ -42,7 +42,7 @@ int master(int argc, char *argv[])
   for (i = 0; i < number_of_tasks; i++) {
     char mailbox[256];
     char sprintf_buffer[256];
-    m_task_t task = NULL;
+    msg_task_t task = NULL;
 
     sprintf(mailbox, "slave-%ld", i % slaves_count);
     sprintf(sprintf_buffer, "Task_%d", i);
@@ -61,7 +61,7 @@ int master(int argc, char *argv[])
     char mailbox[80];
 
     sprintf(mailbox, "slave-%ld", i % slaves_count);
-    m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+    msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_send(finalize, mailbox);
   }
 
@@ -72,7 +72,7 @@ int master(int argc, char *argv[])
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
   _XBT_GNUC_UNUSED int res;
   int id = -1;
   char mailbox[80];
@@ -104,9 +104,9 @@ int slave(int argc, char *argv[])
 }                               /* end_of_slave */
 
 /** Test function */
-MSG_error_t test_all(const char *file)  //(void)
+msg_error_t test_all(const char *file)  //(void)
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   /*start by registering functions before loading script */
   MSG_function_register("master", master);
@@ -122,7 +122,7 @@ MSG_error_t test_all(const char *file)  //(void)
 /** 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 < 2) {
@@ -131,7 +131,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
   res = test_all(argv[1]);
-  MSG_clean();
 
   if (res == MSG_OK)
     return 0;