table: drop last SIZE_MAX from table_set_sort() and table_set_display()

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 99ec7b5b65b499f0696a26d720d7aaea15bac80b..fc5af11f55705f3b04d7d96ed97f94e9318e1b09 100644 (file)
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -1528,11 +1528,11 @@ static int assess(const struct security_info *info, Table *overview_table, Analy
                 if (!details_table)
                         return log_oom();
 
-                (void) table_set_sort(details_table, (size_t) 3, (size_t) 1, (size_t) -1);
+                (void) table_set_sort(details_table, (size_t) 3, (size_t) 1);
                 (void) table_set_reverse(details_table, 3, true);
 
                 if (getenv_bool("SYSTEMD_ANALYZE_DEBUG") <= 0)
-                        (void) table_set_display(details_table, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 6, (size_t) -1);
+                        (void) table_set_display(details_table, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 6);
         }
 
         for (i = 0; i < ELEMENTSOF(security_assessor_table); i++) {

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index ae2d9fc752ca17745229b63282d2c7f1e0f20fb6..f41eb6682808c4b8ad7e20615072a7b8a0abab43 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1090,7 +1090,7 @@ static int analyze_blame(int argc, char *argv[], void *userdata) {
         if (r < 0)
                 return r;
 
-        r = table_set_sort(table, (size_t) 0, (size_t) SIZE_MAX);
+        r = table_set_sort(table, (size_t) 0);
         if (r < 0)
                 return r;
 
@@ -1622,7 +1622,7 @@ static int dump_capabilities(int argc, char *argv[], void *userdata) {
                                 return table_log_add_error(r);
                 }
 
-                (void) table_set_sort(table, (size_t) 1, (size_t) -1);
+                (void) table_set_sort(table, (size_t) 1);
         }
 
         (void) pager_open(arg_pager_flags);

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 71a6d7e05060e29022e49326577dea076b3aeaa8..c8421e1ee7aa40e7f1c8a1e931d512f16869266f 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -211,7 +211,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
         if (r < 0)
                 return log_error_errno(r, "Failed to set empty string: %m");
 
-        r = table_set_sort(table, (size_t) COLUMN_NAME, (size_t) -1);
+        r = table_set_sort(table, (size_t) COLUMN_NAME);
         if (r < 0)
                 return log_error_errno(r, "Failed to set sort column: %m");
 
@@ -224,8 +224,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                                              (size_t) COLUMN_UNIT,
                                              (size_t) COLUMN_SESSION,
                                              (size_t) COLUMN_DESCRIPTION,
-                                             (size_t) COLUMN_MACHINE,
-                                             (size_t) -1);
+                                             (size_t) COLUMN_MACHINE);
         else
                 r = table_set_display(table, (size_t) COLUMN_NAME,
                                              (size_t) COLUMN_PID,
@@ -234,8 +233,7 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
                                              (size_t) COLUMN_CONNECTION,
                                              (size_t) COLUMN_UNIT,
                                              (size_t) COLUMN_SESSION,
-                                             (size_t) COLUMN_DESCRIPTION,
-                                             (size_t) -1);
+                                             (size_t) COLUMN_DESCRIPTION);
 
         if (r < 0)
                 return log_error_errno(r, "Failed to set columns to display: %m");

diff --git a/src/home/homectl.c b/src/home/homectl.c
index d59dfb1f609dbe40d129d84d828b0f2bd80c4150..9d12b9abae528ff5d36d4d26cf6704a83d6e18a2 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -171,7 +171,7 @@ static int list_homes(int argc, char *argv[], void *userdata) {
                 return bus_log_parse_error(r);
 
         if (table_get_rows(table) > 1 || !FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF)) {
-                r = table_set_sort(table, (size_t) 0, (size_t) -1);
+                r = table_set_sort(table, (size_t) 0);
                 if (r < 0)
                         return table_log_sort_error(r);
 

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 98bc21eb2dfc950f314411bb120c4d7143e0c0fa..e871628b9a5d8ade9004580a03b9e6502de146cc 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -131,7 +131,7 @@ static int print_inhibitors(sd_bus *bus) {
                 return bus_log_parse_error(r);
 
         if (table_get_rows(table) > 1) {
-                r = table_set_sort(table, (size_t) 1, (size_t) 0, (size_t) 5, (size_t) 6, (size_t) -1);
+                r = table_set_sort(table, (size_t) 1, (size_t) 0, (size_t) 5, (size_t) 6);
                 if (r < 0)
                         return table_log_sort_error(r);
 

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 3e135858a83c5d0b311779eda85b4852fbfce3d4..4ece3fda5862c7bd2a5e1264a8f94fbb57a9ef76 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -90,7 +90,7 @@ static int show_table(Table *table, const char *word) {
         assert(word);
 
         if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) {
-                r = table_set_sort(table, (size_t) 0, (size_t) -1);
+                r = table_set_sort(table, (size_t) 0);
                 if (r < 0)
                         return table_log_sort_error(r);
 

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index e5befe50e113cfd76689bcfa84cbc30afa97c3bc..68d2a59e95f986ef5567265897f613a1b747ed0a 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -239,7 +239,7 @@ static int show_table(Table *table, const char *word) {
         assert(word);
 
         if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) {
-                r = table_set_sort(table, (size_t) 0, (size_t) -1);
+                r = table_set_sort(table, (size_t) 0);
                 if (r < 0)
                         return table_log_sort_error(r);
 

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 4a8f46761a6c17805ec1b58ba044c8969c605daf..8c36dec12a6cef0da5127726356f84ccaafee183 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -1383,7 +1383,7 @@ static int list_devices(void) {
         if (arg_full)
                 table_set_width(table, 0);
 
-        r = table_set_sort(table, (size_t) 0, (size_t) SIZE_MAX);
+        r = table_set_sort(table, (size_t) 0);
         if (r < 0)
                 return log_error_errno(r, "Failed to set sort index: %m");
 

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 763d5ef37da99a21f6a3b8ca6fc74a21879e005d..a746b3c0c397a1bf71ecc6b976fd2b310958dadc 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1011,7 +1011,7 @@ static int dump_address_labels(sd_netlink *rtnl) {
         if (arg_full)
                 table_set_width(table, 0);
 
-        r = table_set_sort(table, (size_t) 0, (size_t) SIZE_MAX);
+        r = table_set_sort(table, (size_t) 0);
         if (r < 0)
                 return r;
 

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 1964d9c95710bf48eb9a06442485164638a2eae3..22ad337e63e362906bc234a03697a23c2ed716b1 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -1840,10 +1840,10 @@ static int context_dump_partitions(Context *context, const char *node) {
         if (!DEBUG_LOGGING) {
                 if (arg_json_format_flags & JSON_FORMAT_OFF)
                         (void) table_set_display(t, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4,
-                                                    (size_t) 8, (size_t) 11, (size_t) -1);
+                                                    (size_t) 8, (size_t) 11);
                 else
                         (void) table_set_display(t, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4,
-                                                    (size_t) 5, (size_t) 6, (size_t) 7, (size_t) 9, (size_t) 10, (size_t) 12, (size_t) -1);
+                                                    (size_t) 5, (size_t) 6, (size_t) 7, (size_t) 9, (size_t) 10, (size_t) 12);
         }
 
         (void) table_set_align_percent(t, table_get_cell(t, 0, 4), 100);

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index af4acc21257c7eb83f53de21951e30b2de2ce54e..7c8e08e332c2761f64fd7e6caad7496d89afdd37 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -834,7 +834,7 @@ static int list_images(int argc, char *argv[], void *userdata) {
                 return bus_log_parse_error(r);
 
         if (table_get_rows(table) > 1) {
-                r = table_set_sort(table, (size_t) 0, (size_t) -1);
+                r = table_set_sort(table, (size_t) 0);
                 if (r < 0)
                         return table_log_sort_error(r);
 

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 8aaa9ccfa415bcbb10d4f6909799683db401cda3..c4a1b0f48f3bd67c19659e01c5eea465956e60c0 100644 (file)
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -1094,7 +1094,7 @@ int table_set_display_all(Table *t) {
         return 0;
 }
 
-int table_set_display(Table *t, size_t first_column, ...) {
+int table_set_display_internal(Table *t, size_t first_column, ...) {
         size_t allocated, column;
         va_list ap;
 
@@ -1124,7 +1124,7 @@ int table_set_display(Table *t, size_t first_column, ...) {
         return 0;
 }
 
-int table_set_sort(Table *t, size_t first_column, ...) {
+int table_set_sort_internal(Table *t, size_t first_column, ...) {
         size_t allocated, column;
         va_list ap;
 

diff --git a/src/shared/format-table.h b/src/shared/format-table.h
index 5a8c1adfae85179e4c14f9e8251f839e2aa991b7..1a486bf5bef429a05ca16c16c9adf7ab4269eddd 100644 (file)
--- a/src/shared/format-table.h
+++ b/src/shared/format-table.h
@@ -101,8 +101,10 @@ void table_set_width(Table *t, size_t width);
 void table_set_cell_height_max(Table *t, size_t height);
 int table_set_empty_string(Table *t, const char *empty);
 int table_set_display_all(Table *t);
-int table_set_display(Table *t, size_t first_column, ...);
-int table_set_sort(Table *t, size_t first_column, ...);
+int table_set_display_internal(Table *t, size_t first_column, ...);
+#define table_set_display(...) table_set_display_internal(__VA_ARGS__, (size_t) SIZE_MAX)
+int table_set_sort_internal(Table *t, size_t first_column, ...);
+#define table_set_sort(...) table_set_sort_internal(__VA_ARGS__, (size_t) SIZE_MAX)
 int table_set_reverse(Table *t, size_t column, bool b);
 int table_hide_column_from_display(Table *t, size_t column);
 

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index f68eaa12dba04ebf756e200320f40e6428884c0f..9b1c4908a40c189e246b0d0a6f7bb6bd7727aa8b 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -228,7 +228,7 @@ static int verb_status(int argc, char **argv, void *userdata) {
                         ret = r;
         }
 
-        (void) table_set_sort(t, (size_t) 0, (size_t) -1);
+        (void) table_set_sort(t, (size_t) 0);
 
         r = table_print_with_pager(t, arg_json_format_flags, arg_pager_flags, arg_legend);
         if (r < 0)
@@ -842,7 +842,7 @@ static int verb_list(int argc, char **argv, void *userdata) {
                         return table_log_add_error(r);
         }
 
-        (void) table_set_sort(t, (size_t) 0, (size_t) -1);
+        (void) table_set_sort(t, (size_t) 0);
 
         return table_print_with_pager(t, arg_json_format_flags, arg_pager_flags, arg_legend);
 }

diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c
index 3f5b42f03774e1d293bfd71cb6a4deb0280f290d..e02a7608feef5d0a18a1d3c07fb6fab689058b73 100644 (file)
--- a/src/systemctl/systemctl-list-units.c
+++ b/src/systemctl/systemctl-list-units.c
@@ -360,7 +360,7 @@ static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) {
 
         if (!arg_show_types) {
                 /* Hide the second (TYPE) column */
-                r = table_set_display(table, (size_t) 0, (size_t) 2, (size_t) 3, (size_t) -1);
+                r = table_set_display(table, (size_t) 0, (size_t) 2, (size_t) 3);
                 if (r < 0)
                         return log_error_errno(r, "Failed to set columns to display: %m");
         }

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 102721dd504a54953e7ea68f18dd069cda7ac07d..e9c6957143aeb642e739a519cf728f5ea38c4a13 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -112,8 +112,8 @@ static int display_user(int argc, char *argv[], void *userdata) {
                 (void) table_set_align_percent(table, table_get_cell(table, 0, 2), 100);
                 (void) table_set_align_percent(table, table_get_cell(table, 0, 3), 100);
                 (void) table_set_empty_string(table, "-");
-                (void) table_set_sort(table, (size_t) 7, (size_t) 2, (size_t) -1);
-                (void) table_set_display(table, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4, (size_t) 5, (size_t) 6, (size_t) -1);
+                (void) table_set_sort(table, (size_t) 7, (size_t) 2);
+                (void) table_set_display(table, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) 4, (size_t) 5, (size_t) 6);
         }
 
         if (argc > 1) {
@@ -262,8 +262,8 @@ static int display_group(int argc, char *argv[], void *userdata) {
 
                 (void) table_set_align_percent(table, table_get_cell(table, 0, 2), 100);
                 (void) table_set_empty_string(table, "-");
-                (void) table_set_sort(table, (size_t) 3, (size_t) 2, (size_t) -1);
-                (void) table_set_display(table, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3, (size_t) -1);
+                (void) table_set_sort(table, (size_t) 3, (size_t) 2);
+                (void) table_set_display(table, (size_t) 0, (size_t) 1, (size_t) 2, (size_t) 3);
         }
 
         if (argc > 1) {
@@ -402,7 +402,7 @@ static int display_memberships(int argc, char *argv[], void *userdata) {
                 if (!table)
                         return log_oom();
 
-                (void) table_set_sort(table, (size_t) 0, (size_t) 1, (size_t) -1);
+                (void) table_set_sort(table, (size_t) 0, (size_t) 1);
         }
 
         if (argc > 1) {
@@ -491,7 +491,7 @@ static int display_services(int argc, char *argv[], void *userdata) {
         if (!t)
                 return log_oom();
 
-        (void) table_set_sort(t, (size_t) 0, (size_t) -1);
+        (void) table_set_sort(t, (size_t) 0);
 
         FOREACH_DIRENT(de, d, return -errno) {
                 _cleanup_free_ char *j = NULL, *no = NULL;