while (1) {
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
- xbt_assert1(cat->layout,
+ xbt_assert(cat->layout,
"No valid layout for the appender of category %s",
cat->name);
cat->layout->do_layout(cat->layout, ev, fmt, appender);
if (!xbt_log_settings)
return priority >= category->threshold;
- xbt_assert0(category, "NULL category");
+ xbt_assert(category, "NULL category");
xbt_assert(category->name);
xbt_dynar_foreach(xbt_log_settings, cursor, setting) {
- xbt_assert0(setting, "Damnit, NULL cat in the list");
- xbt_assert1(setting->catname, "NULL setting(=%p)->catname",
+ xbt_assert(setting, "Damnit, NULL cat in the list");
+ xbt_assert(setting->catname, "NULL setting(=%p)->catname",
(void *) setting);
if (!strcmp(setting->catname, category->name)) {
void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
{
- xbt_assert0(cat, "NULL category to be given a parent");
- xbt_assert1(parent, "The parent category of %s is NULL", cat->name);
+ xbt_assert(cat, "NULL category to be given a parent");
+ xbt_assert(parent, "The parent category of %s is NULL", cat->name);
/*
* if the threshold is initialized
eq = control_string;
control_string += strcspn(control_string, " ");
- xbt_assert1(*dot == '.' && (*eq == '=' || *eq == ':'),
+ xbt_assert(*dot == '.' && (*eq == '=' || *eq == ':'),
"Invalid control string '%s'", control_string);
if (!strncmp(dot + 1, "thresh", (size_t) (eq - dot - 1))) {
void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
{
+#define _xbt_log_cat_init(a, b) (0)
if (!cat->appender) {
XBT_VERB
("No appender to category %s. Setting the file appender as default",
}
cat->layout = lay;
xbt_log_additivity_set(cat, 0);
+#undef _xbt_log_cat_init
}
void xbt_log_additivity_set(xbt_log_category_t cat, int additivity)