From 95e0f1656665cfd00e9377e2452c917b5e6b0fb2 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Sat, 11 Apr 2015 19:47:12 +0200 Subject: [PATCH] logind: make local functions static make manager_gc(), manager_startup(), manager_new(), manager_free() and manager_run() static, and kill their forward declarations. --- src/login/logind.c | 12 +++++++----- src/login/logind.h | 7 ------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/login/logind.c b/src/login/logind.c index ea7c6e74b..d8163ecf9 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -34,7 +34,9 @@ #include "udev-util.h" #include "formats-util.h" -Manager *manager_new(void) { +static void manager_free(Manager *m); + +static Manager *manager_new(void) { Manager *m; int r; @@ -100,7 +102,7 @@ fail: return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; @@ -890,7 +892,7 @@ static int manager_connect_udev(Manager *m) { return 0; } -void manager_gc(Manager *m, bool drop_not_started) { +static void manager_gc(Manager *m, bool drop_not_started) { Seat *seat; Session *session; User *user; @@ -1001,7 +1003,7 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us return 0; } -int manager_startup(Manager *m) { +static int manager_startup(Manager *m) { int r; Seat *seat; Session *session; @@ -1088,7 +1090,7 @@ int manager_startup(Manager *m) { return 0; } -int manager_run(Manager *m) { +static int manager_run(Manager *m) { int r; assert(m); diff --git a/src/login/logind.h b/src/login/logind.h index 57dc66133..11534804a 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -122,9 +122,6 @@ struct Manager { size_t runtime_dir_size; }; -Manager *manager_new(void); -void manager_free(Manager *m); - int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device); int manager_add_button(Manager *m, const char *name, Button **_button); int manager_add_seat(Manager *m, const char *id, Seat **_seat); @@ -137,10 +134,6 @@ int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor); int manager_process_seat_device(Manager *m, struct udev_device *d); int manager_process_button_device(Manager *m, struct udev_device *d); -int manager_startup(Manager *m); -int manager_run(Manager *m); - -void manager_gc(Manager *m, bool drop_not_started); bool manager_shall_kill(Manager *m, const char *user); -- 2.30.2