From 8ac0810f6c509a9e69ddfc7f999572684625d08f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 25 Apr 2024 12:44:49 +0900 Subject: [PATCH] logs-show: drop uid argument from add_matches_for_user_units() It is always equivalent to getuid(). Let's call getuid() in the function instead. --- src/journal/journalctl-filter.c | 4 ++-- src/login/loginctl.c | 18 ++++++++---------- src/machine/machinectl.c | 9 ++++----- src/shared/logs-show.c | 6 +++--- src/shared/logs-show.h | 4 +--- src/systemctl/systemctl-show.c | 3 +-- 6 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c index 1fdde5eb379..039fa5dc8b9 100644 --- a/src/journal/journalctl-filter.c +++ b/src/journal/journalctl-filter.c @@ -208,7 +208,7 @@ static int add_units(sd_journal *j) { if (r < 0) return r; } else { - r = add_matches_for_user_unit(j, u, getuid()); + r = add_matches_for_user_unit(j, u); if (r < 0) return r; r = sd_journal_add_disjunction(j); @@ -227,7 +227,7 @@ static int add_units(sd_journal *j) { return r; SET_FOREACH(u, units) { - r = add_matches_for_user_unit(j, u, getuid()); + r = add_matches_for_user_unit(j, u); if (r < 0) return r; r = sd_journal_add_disjunction(j); diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 8236dc2dc83..cf3bff437a0 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -733,16 +733,15 @@ static int print_session_status_info(sd_bus *bus, const char *path) { show_journal_by_unit( stdout, i.scope, - NULL, + /* namespace = */ NULL, arg_output, - 0, + /* n_columns = */ 0, i.timestamp.monotonic, arg_lines, - 0, get_output_flags() | OUTPUT_BEGIN_NEWLINE, SD_JOURNAL_LOCAL_ONLY, - true, - NULL); + /* system_unit = */ true, + /* ellipsized = */ NULL); } return 0; @@ -839,16 +838,15 @@ static int print_user_status_info(sd_bus *bus, const char *path) { show_journal_by_unit( stdout, i.slice, - NULL, + /* namespace = */ NULL, arg_output, - 0, + /* n_columns = */ 0, i.timestamp.monotonic, arg_lines, - 0, get_output_flags() | OUTPUT_BEGIN_NEWLINE, SD_JOURNAL_LOCAL_ONLY, - true, - NULL); + /* system_unit = */ true, + /* ellipsized = */ NULL); } return 0; diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 42b7fef7204..1b63e6d2037 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -605,16 +605,15 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) { show_journal_by_unit( stdout, i->unit, - NULL, + /* namespace = */ NULL, arg_output, - 0, + /* n_columns = */ 0, i->timestamp.monotonic, arg_lines, - 0, get_output_flags() | OUTPUT_BEGIN_NEWLINE, SD_JOURNAL_LOCAL_ONLY, - true, - NULL); + /* system_unit = */ true, + /* ellipsized = */ NULL); } } diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index d5b131a187f..f7cededf6f1 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1620,7 +1620,8 @@ int add_matches_for_unit(sd_journal *j, const char *unit) { return r; } -int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) { +int add_matches_for_user_unit(sd_journal *j, const char *unit) { + uid_t uid = getuid(); int r; assert(j); @@ -1708,7 +1709,6 @@ int show_journal_by_unit( unsigned n_columns, usec_t not_before, unsigned how_many, - uid_t uid, OutputFlags flags, int journal_open_flags, bool system_unit, @@ -1734,7 +1734,7 @@ int show_journal_by_unit( if (system_unit) r = add_matches_for_unit(j, unit); else - r = add_matches_for_user_unit(j, unit, uid); + r = add_matches_for_user_unit(j, unit); if (r < 0) return log_error_errno(r, "Failed to add unit matches: %m"); diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h index 3a8ce8b7c12..da1bbe04207 100644 --- a/src/shared/logs-show.h +++ b/src/shared/logs-show.h @@ -49,8 +49,7 @@ int add_matches_for_unit( int add_matches_for_user_unit( sd_journal *j, - const char *unit, - uid_t uid); + const char *unit); int show_journal_by_unit( FILE *f, @@ -60,7 +59,6 @@ int show_journal_by_unit( unsigned n_columns, usec_t not_before, unsigned how_many, - uid_t uid, OutputFlags flags, int journal_open_flags, bool system_unit, diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 74d6465739d..2fdf3218868 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -847,10 +847,9 @@ static void print_status_info( i->id, i->log_namespace, arg_output, - 0, + /* n_columns = */ 0, i->inactive_exit_timestamp_monotonic, arg_lines, - getuid(), get_output_flags() | OUTPUT_BEGIN_NEWLINE, SD_JOURNAL_LOCAL_ONLY, arg_runtime_scope == RUNTIME_SCOPE_SYSTEM, -- 2.47.3