X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-user.h;h=f3fa4403d8284da07f40b6e3b338aefbfb405f68;hp=722247806bbb5592fa67e4d3c42e770b208bc7e8;hb=ad0ff86c7c90c3d652edb7c81ebd3f07f70a9a07;hpb=8af9597bdb2f17e0220c90299a322cfff3c4195f

diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index 722247806..f3fa4403d 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -39,19 +37,23 @@ typedef enum UserState {
 
 struct User {
         Manager *manager;
-
         uid_t uid;
         gid_t gid;
         char *name;
-
         char *state_file;
         char *runtime_path;
 
-        char *service;
+        /* 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 *slice;
+        char *service;
+
 
+#if 0 /// UNNEEDED by elogind
         char *service_job;
         char *slice_job;
+#endif // 0
 
         Session *display;
 
@@ -65,8 +67,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);