Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[simgrid.git] / examples / msg / chainsend / chainsend.c

diff --git a/examples/msg/chainsend/chainsend.c b/examples/msg/chainsend/chainsend.c
index 06e7bea..51ca4d7 100644 (file)
--- a/examples/msg/chainsend/chainsend.c
+++ b/examples/msg/chainsend/chainsend.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2010, 2012. The SimGrid Team.
- * Copyright (c) 2012. Maximiliano Geier.
+/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "simgrid/msg.h"        /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "xbt/sysdep.h"         /* calloc */
 
 /* Create a log channel to have nice outputs. */
@@ -45,8 +44,6 @@ msg_error_t test_all(const char *platform_file,
 
   msg_error_t res = MSG_OK;
 
-
-
   XBT_DEBUG("test_all");
 
   /*  Simulation setting */
@@ -87,24 +84,6 @@ int main(int argc, char *argv[])
 
   MSG_init(&argc, argv);
 
-  /*if (argc <= 3) {
-    XBT_CRITICAL("Usage: %s platform_file deployment_file <model>\n",
-              argv[0]);
-    XBT_CRITICAL
-        ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
-         argv[0]);
-    exit(1);
-  }*/
-
-  /* Options for the workstation/model:
-
-     KCCFLN05              => for maxmin
-     KCCFLN05_proportional => for proportional (Vegas)
-     KCCFLN05_Vegas        => for TCP Vegas
-     KCCFLN05_Reno         => for TCP Reno
-   */
-  //MSG_config("workstation/model", argv[3]);
-
   res = test_all(argv[1], argv[2]);
 
   XBT_INFO("Total simulation time: %e", MSG_get_clock());
@@ -113,8 +92,5 @@ int main(int argc, char *argv[])
   _set_output_format(prev_exponent_format);
 #endif
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}