A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove usage of xbt_assert[0-9].
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
8ce7c5d
..
f9cd22f
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-606,7
+606,7
@@
void _xbt_log_event_log(xbt_log_event_t ev, const char *fmt, ...)
while (1) {
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
while (1) {
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
- xbt_assert
1
(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);
"No valid layout for the appender of category %s",
cat->name);
cat->layout->do_layout(cat->layout, ev, fmt, appender);
@@
-738,12
+738,12
@@
int _xbt_log_cat_init(xbt_log_category_t category,
if (!xbt_log_settings)
return priority >= category->threshold;
if (!xbt_log_settings)
return priority >= category->threshold;
- xbt_assert
0
(category, "NULL category");
+ xbt_assert(category, "NULL category");
xbt_assert(category->name);
xbt_dynar_foreach(xbt_log_settings, cursor, setting) {
xbt_assert(category->name);
xbt_dynar_foreach(xbt_log_settings, cursor, setting) {
- xbt_assert
0
(setting, "Damnit, NULL cat in the list");
- xbt_assert
1
(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 *) setting);
if (!strcmp(setting->catname, category->name)) {
@@
-769,8
+769,8
@@
int _xbt_log_cat_init(xbt_log_category_t category,
void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
{
void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent)
{
- xbt_assert
0
(cat, "NULL category to be given a parent");
- xbt_assert
1
(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
/*
* if the threshold is initialized
@@
-858,7
+858,7
@@
static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
eq = control_string;
control_string += strcspn(control_string, " ");
eq = control_string;
control_string += strcspn(control_string, " ");
- xbt_assert
1
(*dot == '.' && (*eq == '=' || *eq == ':'),
+ xbt_assert(*dot == '.' && (*eq == '=' || *eq == ':'),
"Invalid control string '%s'", control_string);
if (!strncmp(dot + 1, "thresh", (size_t) (eq - dot - 1))) {
"Invalid control string '%s'", control_string);
if (!strncmp(dot + 1, "thresh", (size_t) (eq - dot - 1))) {