diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-02-21 19:16:19 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:23:22 +0100 |
commit | c286398e07a7a16aa88a3437318cb2edf8c082c1 (patch) | |
tree | 3c58806c87e6dfc83acf29317d3879972f19e2da /src/login | |
parent | 9d615aabbd765b1186932b1bbd1932eb3fa20523 (diff) |
Cleaned up more unneeded functions and types in:
- src/basic/ioprio.h - removed
- src/basic/ring.h - removed
- src/basic/capability.[hc] - cleaned
- src/basic/cgroup-util.[hc] - cleaned
- src/basic/hostname-util.[hc] - cleaned
- src/basic/path-util.[hc] - cleaned
- src/basic/socket-util.h - cleaned
- src/basic/strv.[hc] - cleaned
- src/basic/time-util.[hc] - cleaned
- src/basic/unit-name.[hc] - cleaned
- src/basic/util.[hc] - cleaned
- src/libelogind/sd-bus/bus-introspect.c - cleaned
- src/login/loginctl.c - cleaned
- src/login/logind-dbus.c - cleaned
- src/login/logind.h - cleaned
- src/shared/conf-parser.[hc] - cleaned
Diffstat (limited to 'src/login')
-rw-r--r-- | src/login/loginctl.c | 10 | ||||
-rw-r--r-- | src/login/logind-dbus.c | 2 | ||||
-rw-r--r-- | src/login/logind.h | 10 |
3 files changed, 14 insertions, 8 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 543f14063..7b259ce21 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -95,6 +95,8 @@ static void polkit_agent_open_if_enabled(void) { polkit_agent_open(); } +/// UNNEEDED by elogind +#if 0 static OutputFlags get_output_flags(void) { return @@ -103,6 +105,7 @@ static OutputFlags get_output_flags(void) { (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR; } +#endif // 0 static int list_sessions(int argc, char *argv[], void *userdata) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -244,6 +247,8 @@ static int list_seats(int argc, char *argv[], void *userdata) { return 0; } +/// UNNEEDED by elogind +#if 0 static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit, pid_t leader) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; @@ -291,6 +296,7 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit show_cgroup_and_extra(ELOGIND_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags()); return 0; } +#endif // 0 typedef struct SessionStatusInfo { char *id; @@ -547,8 +553,8 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li if (i.scope) { printf("\t Unit: %s\n", i.scope); - show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader); #if 0 + show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader); if (arg_transport == BUS_TRANSPORT_LOCAL) { show_journal_by_unit( @@ -631,8 +637,8 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line) if (i.slice) { printf("\t Unit: %s\n", i.slice); - show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0); #if 0 + show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0); show_journal_by_unit( stdout, i.slice, diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index bf00b137a..5dedbfc90 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2621,7 +2621,6 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err return 0; } -#endif // 0 int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *path, *unit; @@ -2710,6 +2709,7 @@ int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error return 0; } +#endif // 0 int manager_send_changed(Manager *manager, const char *property, ...) { char **l; diff --git a/src/login/logind.h b/src/login/logind.h index 0b6422fc1..29432823e 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -191,11 +191,11 @@ bool manager_is_docked_or_multiple_displays(Manager *m); extern const sd_bus_vtable manager_vtable[]; -int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); +// UNNEEDED int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); /// eloginds own version does the action itself #if 0 |