From bd85a6836573193df1aaa29325da1ed8370e85a6 Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 24 Jun 2010 11:40:38 +0000 Subject: [PATCH] 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 --- src/config_unit.c | 4 ++-- src/dict_unit.c | 4 +--- src/dynar_unit.c | 2 +- src/xbt/config.c | 3 ++- src/xbt/dict.c | 3 +-- src/xbt/dynar.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/config_unit.c b/src/config_unit.c index aee0d7304a..f8f3584d5d 100644 --- a/src/config_unit.c +++ b/src/config_unit.c @@ -12,8 +12,8 @@ #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() { diff --git a/src/dict_unit.c b/src/dict_unit.c index 56e96f220b..fa125ddc43 100644 --- a/src/dict_unit.c +++ b/src/dict_unit.c @@ -14,9 +14,7 @@ #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) { diff --git a/src/dynar_unit.c b/src/dynar_unit.c index 3c9b2761fe..6791935093 100644 --- a/src/dynar_unit.c +++ b/src/dynar_unit.c @@ -13,7 +13,7 @@ #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") { diff --git a/src/xbt/config.c b/src/xbt/config.c index 0936822379..22e5729e4a 100644 --- 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" -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"); diff --git a/src/xbt/dict.c b/src/xbt/dict.c index 4f507cbb75..af51012d82 100644 --- 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); -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"); diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index 02a9a12591..5770d7ce6b 100644 --- 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_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") { -- 2.20.1