summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/analyze/analyze-security.c4
-rw-r--r--src/analyze/analyze.c4
-rw-r--r--src/busctl/busctl.c8
-rw-r--r--src/home/homectl.c2
-rw-r--r--src/login/inhibit.c2
-rw-r--r--src/login/loginctl.c2
-rw-r--r--src/machine/machinectl.c2
-rw-r--r--src/mount/mount-tool.c2
-rw-r--r--src/network/networkctl.c2
-rw-r--r--src/partition/repart.c4
-rw-r--r--src/portable/portablectl.c2
-rw-r--r--src/shared/format-table.c4
-rw-r--r--src/shared/format-table.h6
-rw-r--r--src/sysext/sysext.c4
-rw-r--r--src/systemctl/systemctl-list-units.c2
-rw-r--r--src/userdb/userdbctl.c12
16 files changed, 31 insertions, 31 deletions
diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 99ec7b5b65..fc5af11f55 100644
--- 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 ae2d9fc752..f41eb66828 100644
--- 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 71a6d7e050..c8421e1ee7 100644
--- 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 d59dfb1f60..9d12b9abae 100644
--- 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 98bc21eb2d..e871628b9a 100644
--- 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 3e135858a8..4ece3fda58 100644
--- 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 e5befe50e1..68d2a59e95 100644
--- 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 4a8f46761a..8c36dec12a 100644
--- 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 763d5ef37d..a746b3c0c3 100644
--- 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 1964d9c957..22ad337e63 100644
--- 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 af4acc2125..7c8e08e332 100644
--- 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 8aaa9ccfa4..c4a1b0f48f 100644
--- 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 5a8c1adfae..1a486bf5be 100644
--- 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 f68eaa12db..9b1c4908a4 100644
--- 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 3f5b42f037..e02a7608fe 100644
--- 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 102721dd50..e9c6957143 100644
--- 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;
View Lorry Controller Status