diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-01-10 18:23:22 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-01-10 18:28:17 +0900 |
| commit | 679c7c7a67411cd9759b3c9a9e494d4a96f36a69 (patch) | |
| tree | 564b942bb2ea29b80cc9a92474a9a82d48f8d3ea /src/machine | |
| parent | 9c46b437fcb13a1bfff0d992f106231b3ce59120 (diff) | |
| download | systemd-679c7c7a67411cd9759b3c9a9e494d4a96f36a69.tar.gz | |
machinectl: optimize table creation
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machinectl.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 7ba51f0e77..2c2b13b86f 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -352,7 +352,7 @@ static int list_machines(int argc, char *argv[], void *userdata) { TABLE_STRING, empty_to_dash(version_id), TABLE_STRING, empty_to_dash(addresses)); 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); @@ -401,8 +401,6 @@ static int list_images(int argc, char *argv[], void *userdata) { for (;;) { uint64_t crtime, mtime, size; const char *name, *type; - TableCell *cell; - bool ro_bool; int ro_int; r = sd_bus_message_read(reply, "(ssbttto)", &name, &type, &ro_int, &crtime, &mtime, &size, NULL); @@ -416,27 +414,14 @@ static int list_images(int argc, char *argv[], void *userdata) { r = table_add_many(table, TABLE_STRING, name, - TABLE_STRING, type); - if (r < 0) - return log_error_errno(r, "Failed to add table row: %m"); - - ro_bool = ro_int; - r = table_add_cell(table, &cell, TABLE_BOOLEAN, &ro_bool); - if (r < 0) - return log_error_errno(r, "Failed to add table cell: %m"); - - if (ro_bool) { - r = table_set_color(table, cell, ansi_highlight_red()); - if (r < 0) - return log_error_errno(r, "Failed to set table cell color: %m"); - } - - r = table_add_many(table, + TABLE_STRING, type, + TABLE_BOOLEAN, ro_int, + TABLE_SET_COLOR, ro_int ? ansi_highlight_red() : NULL, TABLE_SIZE, size, TABLE_TIMESTAMP, crtime, TABLE_TIMESTAMP, mtime); 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); |