Fix commit f48cc395ebecc84d865ab551a672d2a2358624e5

[simgrid.git] / testsuite / xbt / log_usage.c

diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c
index 199a857..16a24ee 100644 (file)
--- a/testsuite/xbt/log_usage.c
+++ b/testsuite/xbt/log_usage.c
@@ -1,12 +1,11 @@
-/* $Id$ */
-
 /* log_usage - A test of normal usage of the log facilities                 */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. 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. */
- 
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -15,32 +14,35 @@
 
 
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,"Logging specific to this test");
-XBT_LOG_NEW_CATEGORY(top,"Useless test channel");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,
+                                "Logging specific to this test");
+XBT_LOG_NEW_CATEGORY(top, "Useless test channel");
 
 #ifdef __BORLANDC__
 #pragma argsused
 #endif
 
-static void dolog(const char *settings) {
-  INFO1("Test with the settings '%s'",settings);
+static void dolog(const char *settings)
+{
+  XBT_INFO("Test with the settings '%s'", settings);
   xbt_log_control_set(settings);
-  DEBUG1("val=%d", 1);
-  WARN1("val=%d", 2);
-  CDEBUG2(top, "val=%d%s", 3, "!");
-  CRITICAL6("false alarm%s%s%s%s%s%s", "","","","","","!");   
+  XBT_DEBUG("val=%d", 1);
+  XBT_WARN("val=%d", 2);
+  XBT_CDEBUG(top, "val=%d%s", 3, "!");
+  XBT_CRITICAL("false alarm%s%s%s%s%s%s", "", "", "", "", "", "!");
 }
 
 
-int main(int argc, char **argv) {
-  xbt_init(&argc,argv);
+int main(int argc, char **argv)
+{
+  xbt_init(&argc, argv);
 
   dolog("");
-  dolog("test.thres:info root.thres:info");
-  dolog("test.thres:debug");
-  dolog("test.thres:verbose root.thres:error");
-  dolog("test.thres:critical");
-  
-  xbt_exit();
+  dolog(" ");
+  dolog(" test.thres:info root.thres:info  ");
+  dolog(" test.thres:debug ");
+  dolog(" test.thres:verbose root.thres:error ");
+  dolog(" test.thres:critical ");
+
   return 0;
 }