Energy, onHostDestruction: ensured ptr existence

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

diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c
index 2fd25c3..b184bf5 100644 (file)
--- a/examples/msg/priority/priority.c
+++ b/examples/msg/priority/priority.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@ static int test(int argc, char *argv[])
   double priority = 1.0;
   msg_task_t task = NULL;
 
-  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
+  XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
   xbt_assert(res, "Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &priority);
   xbt_assert(res, "Invalid argument %s\n", argv[2]);
@@ -74,19 +74,15 @@ int main(int argc, char *argv[])
 
 
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+           "\tExample: %s msg_platform.xml msg_deployment.xml\n", 
+           argv[0], argv[0]);
+  
   res = test_all(argv[1], argv[2]);
 
 #ifdef _MSC_VER
   _set_output_format(prev_exponent_format);
 #endif
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }