Merge pull request #30513 from rpigott/resolved-ede

[thirdparty/systemd.git] / src / shared / utmp-wtmp.h

diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 188d011fdd71e24737c12616329579f7c93041d2..2e04fac404726ef6e048d2da144f74aafea954a4 100644 (file)
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -5,7 +5,6 @@
 #include <sys/types.h>
 
 #include "time-util.h"
-#include "util.h"
 
 #if ENABLE_UTMP
 #include <utmpx.h>
@@ -19,19 +18,13 @@ int utmp_put_runlevel(int runlevel, int previous);
 int utmp_put_dead_process(const char *id, pid_t pid, int code, int status);
 int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line, int ut_type, const char *user);
 
-int utmp_wall(
-        const char *message,
-        const char *username,
-        const char *origin_tty,
-        bool (*match_tty)(const char *tty, bool is_local, void *userdata),
-        void *userdata);
-
 static inline bool utxent_start(void) {
         setutxent();
         return true;
 }
 static inline void utxent_cleanup(bool *initialized) {
-        if (initialized)
+        assert(initialized);
+        if (*initialized)
                 endutxent();
 }
 
@@ -55,13 +48,5 @@ static inline int utmp_put_dead_process(const char *id, pid_t pid, int code, int
 static inline int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line, int ut_type, const char *user) {
         return 0;
 }
-static inline int utmp_wall(
-                const char *message,
-                const char *username,
-                const char *origin_tty,
-                bool (*match_tty)(const char *tty, bool is_local, void *userdata),
-                void *userdata) {
-        return 0;
-}
 
 #endif /* ENABLE_UTMP */