X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca6ced4ab7e6b5f0e61970d9930b0f7b8616c154..933169f7340432501f2493e81b31589f4e4a7c8a:/src/xbt/log.c diff --git a/src/xbt/log.c b/src/xbt/log.c index 00d69f0f96..0ed94a9a4a 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -18,8 +18,7 @@ #include "xbt/error.h" #include "xbt/dynar.h" -/** \defgroup XBT_log Logging support - * \brief A generic logging facility in the spirit of log4j +/** \addtogroup XBT_log * * This section describes the API to the log functions used * everywhere in this project. @@ -323,8 +322,8 @@ static xbt_dynar_t xbt_log_settings=NULL; static void _free_setting(void *s) { xbt_log_setting_t set=(xbt_log_setting_t)s; if (set) { - xbt_free(set->catname); -/* xbt_free(set); FIXME: uncommenting this leads to segfault when more than one chunk is passed as gras-log */ + free(set->catname); +/* free(set); FIXME: uncommenting this leads to segfault when more than one chunk is passed as gras-log */ } } @@ -348,7 +347,7 @@ s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = { XBT_LOG_NEW_CATEGORY(xbt,"All XBT categories (simgrid toolbox)"); XBT_LOG_NEW_CATEGORY(surf,"All SURF categories"); XBT_LOG_NEW_CATEGORY(msg,"All MSG categories"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log,xbt,"Loggings from the logging mecanism itself"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log,xbt,"Loggings from the logging mechanism itself"); void xbt_log_init(int *argc,char **argv, const char *defaultlog) { int i,j; @@ -561,7 +560,7 @@ static void _xbt_log_parse_setting(const char* control_string, } else { xbt_assert1(FALSE,"Unknown priority name: %s",eq+1); } - xbt_free(neweq); + free(neweq); } else { char buff[512]; snprintf(buff,min(512,eq - dot - 1),"%s",dot+1); @@ -682,12 +681,12 @@ void xbt_log_control_set(const char* control_string) { set = xbt_new(s_xbt_log_setting_t,1); } else { DEBUG0("Apply directly"); - xbt_free(set->catname); + free(set->catname); xbt_log_threshold_set(cat,set->thresh); } } - xbt_free(set); - xbt_free(cs); + free(set); + free(cs); } void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app) {