SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

analyze: consistently print error if table formatting fails

Browse Source 
We don't want to return an error without printing something.
So for things which don't matter, explicitly suppress the error
with (void). In other cases, add the standard message.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-04-03 13:05:27 +02:00
parent 1008583c91
commit 4419840ad1
4 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/analyze/analyze-blame.c
+5 -11
View File
@@ -29,26 +29,20 @@ int verb_blame(int argc, char *argv[], uintptr_t _data, void *userdata) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_set_align_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_align_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_set_sort(table, (size_t) 0);
if (r < 0)
return r;
return table_log_sort_error(r);
r = table_set_reverse(table, 0, true);
if (r < 0)
return r;
return table_log_sort_error(r);
for (UnitTimes *u = times; u->has_data; u++) {
if (u->time <= 0)
src/analyze/analyze-calendar.c
+2 -6
View File
@@ -35,14 +35,10 @@ static int test_calendar_one(usec_t n, const char *p) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
if (!streq(t, p)) {
r = table_add_many(table,
src/analyze/analyze-timespan.c
+2 -6
View File
@@ -28,14 +28,10 @@ int verb_timespan(int argc, char *argv[], uintptr_t _data, void *userdata) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_add_many(table,
TABLE_FIELD, "Original",
src/analyze/analyze-timestamp.c
+3 -7
View File
@@ -27,14 +27,10 @@ static int test_timestamp_one(const char *p) {
return log_oom();
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
(void) table_set_ellipsize_percent(table, cell, 100);
r = table_add_many(table,
TABLE_FIELD, "Original form",
@@ -65,7 +61,7 @@ static int test_timestamp_one(const char *p) {
usec / USEC_PER_SEC,
usec % USEC_PER_SEC);
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_many(table,
TABLE_FIELD, "From now",