analyze: consistently print error if table formatting fails

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.

diff --git a/src/analyze/analyze-blame.c b/src/analyze/analyze-blame.c
index 24b29a26a1ff168be73ec5cd14c01bfeb3c1c4ea..d400380ade903a90bde50a97956bffefe62ccb81 100644 (file)
--- a/src/analyze/analyze-blame.c
+++ b/src/analyze/analyze-blame.c
@@ -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)

diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c
index c1427f25aabf221921397ae345489fd932b934b9..a9fb1e897e67e3445376884b096e4831e4557643 100644 (file)
--- a/src/analyze/analyze-calendar.c
+++ b/src/analyze/analyze-calendar.c
@@ -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,

diff --git a/src/analyze/analyze-timespan.c b/src/analyze/analyze-timespan.c
index 31a201c5f6c5dfa7169e12275d10fce1141d671d..de78736e2ca098cea3410416249b53ca816c3bbe 100644 (file)
--- a/src/analyze/analyze-timespan.c
+++ b/src/analyze/analyze-timespan.c
@@ -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",

diff --git a/src/analyze/analyze-timestamp.c b/src/analyze/analyze-timestamp.c
index 5d4fa2f6250f596557691baba507b5cd5d60f440..50cda12d7186553316866983d807b801c51cf664 100644 (file)
--- a/src/analyze/analyze-timestamp.c
+++ b/src/analyze/analyze-timestamp.c
@@ -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",