Some log default categories are already defined.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7933 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/config_unit.c b/src/config_unit.c
index aee0d73..f8f3584 100644 (file)
--- a/src/config_unit.c
+++ b/src/config_unit.c
@@ -12,8 +12,8 @@
 #include "xbt.h"
 #include "xbt/ex.h"
 
 #include "xbt.h"
 #include "xbt/ex.h"
 

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
-
+XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
+XBT_LOG_DEFAULT_CATEGORY(xbt_cfg);

 
 static xbt_cfg_t make_set()
 {
 
 static xbt_cfg_t make_set()
 {

diff --git a/src/dict_unit.c b/src/dict_unit.c
index 56e96f2..fa125dd 100644 (file)
--- a/src/dict_unit.c
+++ b/src/dict_unit.c
@@ -14,9 +14,7 @@
 #include "portable.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);
 #include "portable.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
-                                "Dictionaries provide the same functionalities than hash tables");
-
+XBT_LOG_DEFAULT_CATEGORY(xbt_dict);

 
 static void print_str(void *str)
 {
 
 static void print_str(void *str)
 {

diff --git a/src/dynar_unit.c b/src/dynar_unit.c
index 3c9b276..6791935 100644 (file)
--- a/src/dynar_unit.c
+++ b/src/dynar_unit.c
@@ -13,7 +13,7 @@
 #define NB_ELEM 5000
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
 #define NB_ELEM 5000
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dyn, xbt, "Dynamic arrays");
+XBT_LOG_DEFAULT_CATEGORY(xbt_dyn);

 
 XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers")
 {
 
 XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers")
 {

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 0936822..22e5729 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -1294,7 +1294,8 @@ xbt_cfg_get_peer_at(xbt_cfg_t cfg, const char *name, int pos,
 #include "xbt.h"
 #include "xbt/ex.h"
 
 #include "xbt.h"
 #include "xbt/ex.h"
 

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
+XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
+XBT_LOG_DEFAULT_CATEGORY(xbt_cfg);

 
 XBT_TEST_SUITE("config", "Configuration support");
 
 
 XBT_TEST_SUITE("config", "Configuration support");
 

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 4f507cb..af51012 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -811,8 +811,7 @@ static void dict_mallocator_reset_f(void *dict)
 #include "portable.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);
 #include "portable.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt,
-                                "Dictionaries provide the same functionalities than hash tables");
+XBT_LOG_DEFAULT_CATEGORY(xbt_dict);

 
 XBT_TEST_SUITE("dict", "Dict data container");
 
 
 XBT_TEST_SUITE("dict", "Dict data container");
 

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 02a9a12..5770d7c 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -717,7 +717,7 @@ XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar, int_f_cpvoid_cpvoid_t compar_f
 
 XBT_TEST_SUITE("dynar", "Dynar data container");
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
 
 XBT_TEST_SUITE("dynar", "Dynar data container");
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dyn, xbt, "Dynamic arrays");
+XBT_LOG_DEFAULT_CATEGORY(xbt_dyn);

 
 XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers")
 {
 
 XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers")
 {