Merge pull request #12509 from poettering/table-fixlets

two trivial fixes to table formatting code

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 342ac56d90437e022179ab04ab9686c607b54525..3db7224623bb45ddf7f9b39fedb7831e7d3325dc 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -94,7 +94,7 @@ static int show_table(Table *table, const char *word) {
         assert(table);
         assert(word);
 
-        if (table_get_rows(table) > 1) {
+        if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) {
                 r = table_set_sort(table, (size_t) 0, (size_t) -1);
                 if (r < 0)
                         return log_error_errno(r, "Failed to sort table: %m");

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index d98027a0ca5fdd63246f8498b960d1373743910d..693184f0a1e28a5686b73ace36cfbfe1e70782b0 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -255,7 +255,7 @@ static int show_table(Table *table, const char *word) {
         assert(table);
         assert(word);
 
-        if (table_get_rows(table) > 1) {
+        if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) {
                 r = table_set_sort(table, (size_t) 0, (size_t) -1);
                 if (r < 0)
                         return log_error_errno(r, "Failed to sort table: %m");

diff --git a/src/shared/format-table.h b/src/shared/format-table.h
index 5ff247953b5f2cb653812c8c421fe2c1d9f3d145..85e3afce4c3511e41c3c949af50f05d1e2334740 100644 (file)
--- a/src/shared/format-table.h
+++ b/src/shared/format-table.h
@@ -75,4 +75,4 @@ const void *table_get(Table *t, TableCell *cell);
 const void *table_get_at(Table *t, size_t row, size_t column);
 
 int table_to_json(Table *t, JsonVariant **ret);
-int table_print_json(Table *t, FILE *f, unsigned json_flags);
+int table_print_json(Table *t, FILE *f, JsonFormatFlags json_flags);