chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Add missing fixes from upstream [4/6] src/login
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index 5b7a67e33010d4e645f41f2ac760450f86b776db..2a2eaaa83cc8fcfd113962d5fa38600daeb8b844 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-521,7
+521,7
@@
static int session_start_scope(Session *s) {
assert(s->user);
if (!s->scope) {
assert(s->user);
if (!s->scope) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
char *scope, *job = NULL;
const char *description;
char *scope, *job = NULL;
const char *description;
@@
-646,7
+646,7
@@
int session_start(Session *s) {
#if 0 /// UNNEEDED by elogind
static int session_stop_scope(Session *s, bool force) {
#if 0 /// UNNEEDED by elogind
static int session_stop_scope(Session *s, bool force) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
char *job = NULL;
int r;
char *job = NULL;
int r;
@@
-677,7
+677,7
@@
static int session_stop_scope(Session *s, bool force) {
#endif // 0
static int session_stop_cgroup(Session *s, bool force) {
#endif // 0
static int session_stop_cgroup(Session *s, bool force) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
int r;
assert(s);
int r;
assert(s);