Prep v228: Add remaining updates from upstream (3/3)

[elogind.git] / src / login / logind-user.h

diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index b30e7d60c23bf6600816237a59e2a313e2f47cac..a59b11b2a3f1f02df468159dc357dda5b933ff1d 100644 (file)
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -39,19 +39,17 @@ typedef enum UserState {
 
 struct User {
         Manager *manager;
-
         uid_t uid;
         gid_t gid;
         char *name;
-
         char *state_file;
         char *runtime_path;
 
         /* These are always NULL, and here just for logind-user-dbus.c
            to easily provide a NULL value for the user's service and
            slice properties. */
-        char *service;
         char *slice;
+        char *service;
 
 /// UNNEEDED (and unsupported) by elogind
 #if 0
@@ -71,8 +69,11 @@ struct User {
         LIST_FIELDS(User, gc_queue);
 };
 
-User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name);
-void user_free(User *u);
+int user_new(User **out, Manager *m, uid_t uid, gid_t gid, const char *name);
+User *user_free(User *u);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(User *, user_free);
+
 bool user_check_gc(User *u, bool drop_not_started);
 void user_add_to_gc_queue(User *u);
 int user_start(User *u);