tree-wide: use table_log_add_error()

yuwata · yuwata · commit bd17fa8cd870 · 2020-01-10T18:28:30.000+09:00
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
@@ -237,7 +237,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                                         TABLE_EMPTY,
                                         TABLE_EMPTY);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to fill line: %m");
+                                return table_log_add_error(r);
 
                         continue;
                 }
@@ -254,7 +254,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                                    TABLE_INT, PTR_TO_INT(v),
                                    TABLE_STRING, k);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add name %s to table: %m", k);
+                        return table_log_add_error(r);
 
                 r = sd_bus_get_name_creds(
                                 bus, k,
@@ -283,7 +283,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                         } else
                                 r = table_add_many(table, TABLE_EMPTY, TABLE_EMPTY);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to add fields to table: %m");
+                                return table_log_add_error(r);
 
                         r = sd_bus_creds_get_euid(creds, &uid);
                         if (r >= 0) {
@@ -297,7 +297,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                         } else
                                 r = table_add_cell(table, NULL, TABLE_EMPTY, NULL);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to add field to table: %m");
+                                return table_log_add_error(r);
 
                         (void) sd_bus_creds_get_unique_name(creds, &unique);
                         (void) sd_bus_creds_get_unit(creds, &unit);
@@ -312,7 +312,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                                         TABLE_STRING, cn);
                 }
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add fields to table: %m");
+                        return table_log_add_error(r);
 
                 if (arg_show_machine) {
                         sd_id128_t mid;
@@ -325,7 +325,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
 
                                 r = table_add_cell(table, NULL, TABLE_STRING, sd_id128_to_string(mid, m));
                                 if (r < 0)
-                                        return log_error_errno(r, "Failed to add field to table: %m");
+                                        return table_log_add_error(r);
 
                                 continue; /* line fully filled, no need to fill the remainder below */
                         }
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
@@ -122,7 +122,7 @@ static int print_inhibitors(sd_bus *bus) {
                                    TABLE_STRING, why,
                                    TABLE_STRING, mode);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add table row: %m");
+                        return table_log_add_error(r);
         }
 
         r = sd_bus_message_exit_container(reply);
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
@@ -189,7 +189,7 @@ static int list_sessions(int argc, char *argv[], void *userdata) {
                                    TABLE_STRING, seat,
                                    TABLE_STRING, strna(tty));
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add row to table: %m");
+                        return table_log_add_error(r);
         }
 
         r = sd_bus_message_exit_container(reply);
@@ -246,7 +246,7 @@ static int list_users(int argc, char *argv[], void *userdata) {
                                    TABLE_UID, (uid_t) uid,
                                    TABLE_STRING, user);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add row to table: %m");
+                        return table_log_add_error(r);
         }
 
         r = sd_bus_message_exit_container(reply);
@@ -298,7 +298,7 @@ static int list_seats(int argc, char *argv[], void *userdata) {
 
                 r = table_add_cell(table, NULL, TABLE_STRING, seat);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to add row to table: %m");
+                        return table_log_add_error(r);
         }
 
         r = sd_bus_message_exit_container(reply);
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
@@ -1446,7 +1446,7 @@ static int list_devices(void) {
 
                         r = table_add_cell(table, NULL, c == COLUMN_NODE ? TABLE_PATH : TABLE_STRING, strna(x));
                         if (r < 0)
-                                return log_error_errno(r, "Failed to add cell: %m");
+                                return table_log_add_error(r);
                 }
         }
 
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ static int print_inhibitors(sd_bus *bus) {`
`122`	`122`	`TABLE_STRING, why,`
`123`	`123`	`TABLE_STRING, mode);`
`124`	`124`	`if (r < 0)`
`125`		`- return log_error_errno(r, "Failed to add table row: %m");`
	`125`	`+ return table_log_add_error(r);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`r = sd_bus_message_exit_container(reply);`
Original file line number	Diff line number	Diff line change
`@@ -1446,7 +1446,7 @@ static int list_devices(void) {`
`1446`	`1446`
`1447`	`1447`	`r = table_add_cell(table, NULL, c == COLUMN_NODE ? TABLE_PATH : TABLE_STRING, strna(x));`
`1448`	`1448`	`if (r < 0)`
`1449`		`- return log_error_errno(r, "Failed to add cell: %m");`
	`1449`	`+ return table_log_add_error(r);`
`1450`	`1450`	`}`
`1451`	`1451`	`}`
`1452`	`1452`