X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d45e78ba048ff7e081f940006a77bc122b5315be..2539fff313cbd67c45b8490f7961e45e358d9ba2:/src/xbt/log_default_appender.c diff --git a/src/xbt/log_default_appender.c b/src/xbt/log_default_appender.c index c96adb63ea..28c5f365ef 100644 --- a/src/xbt/log_default_appender.c +++ b/src/xbt/log_default_appender.c @@ -13,31 +13,31 @@ #include "xbt/error.h" #include -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler"); /** * The root category's default logging function. */ -extern const char *gras_log_priority_names[7]; +extern const char *xbt_log_priority_names[7]; -static void append_file(gras_log_appender_t this, gras_log_event_t ev, +static void append_file(xbt_log_appender_t this, xbt_log_event_t ev, const char *fmt); /* -struct gras_log_appender_file_s { - gras_log_appender_t* appender; +struct xbt_log_appender_file_s { + xbt_log_appender_t* appender; FILE *file; }; */ -static s_gras_log_appender_t gras_log_appender_file = { append_file, NULL } ; +static s_xbt_log_appender_t xbt_log_appender_file = { append_file, NULL } ; /* appender_data=FILE* */ -gras_log_appender_t gras_log_default_appender = &gras_log_appender_file; +xbt_log_appender_t xbt_log_default_appender = &xbt_log_appender_file; -static void append_file(gras_log_appender_t this, - gras_log_event_t ev, +static void append_file(xbt_log_appender_t this, + xbt_log_event_t ev, const char *fmt) { /* TODO: define a format field in struct for timestamp, etc. @@ -46,15 +46,15 @@ static void append_file(gras_log_appender_t this, if ((FILE*)(this->appender_data) == NULL) this->appender_data = (void*)stderr; - gras_assert0(ev->priority>=0, + xbt_assert0(ev->priority>=0, "Negative logging priority naturally forbidden"); - gras_assert1(ev->priorityprioritypriority); fprintf(stderr, "%s:%d: ", ev->fileName, ev->lineNum); fprintf(stderr, "[%s/%s] ", - ev->cat->name, gras_log_priority_names[ev->priority]); + ev->cat->name, xbt_log_priority_names[ev->priority]); vfprintf(stderr, fmt, ev->ap); fprintf(stderr, "\n"); }