X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..0d5011ff9c6105a9e15d451ec5f3b644d5c86659:/examples/msg/mc/bugged2.c diff --git a/examples/msg/mc/bugged2.c b/examples/msg/mc/bugged2.c index a0376a8b82..90dba114cb 100644 --- a/examples/msg/mc/bugged2.c +++ b/examples/msg/mc/bugged2.c @@ -1,5 +1,4 @@ -/* Copyright (c) 2010-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2015. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -15,28 +14,24 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example"); -int server(int argc, char *argv[]); -int client(int argc, char *argv[]); - -int server(int argc, char *argv[]) +static int server(int argc, char *argv[]) { msg_task_t task1 = NULL; msg_task_t task2 = NULL; - long val1, val2; MSG_task_receive(&task1, "mymailbox"); - val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s"); + long val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s"); MSG_task_destroy(task1); task1 = NULL; XBT_INFO("Received %lu", val1); MSG_task_receive(&task2, "mymailbox"); - val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s"); + long val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s"); MSG_task_destroy(task2); task2 = NULL; XBT_INFO("Received %lu", val2); - MC_assert(min(val1, val2) == 1); + MC_assert(MIN(val1, val2) == 1); MSG_task_receive(&task1, "mymailbox"); val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s"); @@ -52,7 +47,7 @@ int server(int argc, char *argv[]) return 0; } -int client(int argc, char *argv[]) +static int client(int argc, char *argv[]) { msg_task_t task1 = MSG_task_create(argv[1], 0, 10000, NULL); msg_task_t task2 = MSG_task_create(argv[1], 0, 10000, NULL); @@ -77,6 +72,5 @@ int main(int argc, char *argv[]) MSG_launch_application("deploy_bugged2.xml"); MSG_main(); - return 0; }