shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-24 06:04:05 +03:00
Code

Merge pull request #16373 from JackFangXN/master

Browse Source 
userdbctl homectl use table_log_add_error()
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-07-06 17:14:07 +02:00 committed by GitHub
commit 5544cd3199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/home/homectl.c
View File

@ -142,12 +142,12 @@ static int list_homes(int argc, char *argv[], void *userdata) {
TABLE_UID, uid, TABLE_UID, uid,
TABLE_GID, gid); TABLE_GID, gid);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
r = table_add_cell(table, &cell, TABLE_STRING, state); r = table_add_cell(table, &cell, TABLE_STRING, state);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add field to table: %m"); return table_log_add_error(r);
color = user_record_state_color(state); color = user_record_state_color(state);
if (color) if (color)
@ -158,7 +158,7 @@ static int list_homes(int argc, char *argv[], void *userdata) {
TABLE_STRING, home, TABLE_STRING, home,
TABLE_STRING, strna(empty_to_null(shell))); TABLE_STRING, strna(empty_to_null(shell)));
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
} }
r = sd_bus_message_exit_container(reply); r = sd_bus_message_exit_container(reply);

4
src/partition/repart.c
View File

@ -1666,7 +1666,7 @@ static int context_dump_partitions(Context *context, const char *node) {
TABLE_UINT64, p->new_padding, TABLE_UINT64, p->new_padding,
TABLE_STRING, padding_change, TABLE_SET_COLOR, !p->partitions_next && sum_padding > 0 ? ansi_underline() : NULL); TABLE_STRING, padding_change, TABLE_SET_COLOR, !p->partitions_next && sum_padding > 0 ? ansi_underline() : NULL);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
} }
if (sum_padding > 0 || sum_size > 0) { if (sum_padding > 0 || sum_size > 0) {
@ -1689,7 +1689,7 @@ static int context_dump_partitions(Context *context, const char *node) {
TABLE_EMPTY, TABLE_EMPTY,
TABLE_STRING, b); TABLE_STRING, b);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
} }
r = table_print(t, stdout); r = table_print(t, stdout);

8
src/userdb/userdbctl.c
View File

@ -85,7 +85,7 @@ static int show_user(UserRecord *ur, Table *table) {
TABLE_STRING, user_record_shell(ur), TABLE_STRING, user_record_shell(ur),
TABLE_INT, (int) user_record_disposition(ur)); TABLE_INT, (int) user_record_disposition(ur));
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
break; break;
@ -234,7 +234,7 @@ static int show_group(GroupRecord *gr, Table *table) {
TABLE_GID, gr->gid, TABLE_GID, gr->gid,
TABLE_INT, (int) group_record_disposition(gr)); TABLE_INT, (int) group_record_disposition(gr));
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
break; break;
@ -377,7 +377,7 @@ static int show_membership(const char *user, const char *group, Table *table) {
TABLE_STRING, user, TABLE_STRING, user,
TABLE_STRING, group); TABLE_STRING, group);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add row to table: %m"); return table_log_add_error(r);
break; break;
@ -521,7 +521,7 @@ static int display_services(int argc, char *argv[], void *userdata) {
TABLE_STRING, no ?: "yes", TABLE_STRING, no ?: "yes",
TABLE_SET_COLOR, no ? ansi_highlight_red() : ansi_highlight_green()); TABLE_SET_COLOR, no ? ansi_highlight_red() : ansi_highlight_green());
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to add table row: %m"); return table_log_add_error(r);
} }
if (table_get_rows(t) <= 0) { if (table_get_rows(t) <= 0) {