dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

table add table_log_sort_error()

Browse Source
This commit is contained in:
fangxiuning
2020-07-07 10:29:14 +08:00
parent d836018a73
commit df83eb546b
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/home/homectl.c
View File

@@ -168,7 +168,7 @@ static int list_homes(int argc, char *argv[], void *userdata) {
if (table_get_rows(table) > 1 || arg_json) {
r = table_set_sort(table, (size_t) 0, (size_t) -1);
if (r < 0)
return log_error_errno(r, "Failed to sort table: %m");
return table_log_sort_error(r);
table_set_header(table, arg_legend);

2
src/login/inhibit.c
View File

@@ -132,7 +132,7 @@ static int print_inhibitors(sd_bus *bus) {
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);
if (r < 0)
return log_error_errno(r, "Failed to sort table: %m");
return table_log_sort_error(r);
table_set_header(table, arg_legend);

2
src/login/loginctl.c
View File

@@ -91,7 +91,7 @@ static int show_table(Table *table, const char *word) {
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");
return table_log_sort_error(r);
table_set_header(table, arg_legend);

2
src/machine/machinectl.c
View File

@@ -237,7 +237,7 @@ static int show_table(Table *table, const char *word) {
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");
return table_log_sort_error(r);
table_set_header(table, arg_legend);

2
src/portable/portablectl.c
View File

@@ -744,7 +744,7 @@ static int list_images(int argc, char *argv[], void *userdata) {
if (table_get_rows(table) > 1) {
r = table_set_sort(table, (size_t) 0, (size_t) -1);
if (r < 0)
return log_error_errno(r, "Failed to sort table: %m");
return table_log_sort_error(r);
table_set_header(table, arg_legend);

3
src/shared/format-table.h
View File

@@ -133,3 +133,6 @@ int table_print_json(Table *t, FILE *f, JsonFormatFlags json_flags);
#define table_log_show_error(r) \
log_error_errno(r, "Failed to show table: %m")
#define table_log_sort_error(r) \
log_error_errno(r, "Failed to sort table: %m")