chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: reorder bonding and bridging
[elogind.git]
/
src
/
login
/
logind-seat-dbus.c
diff --git
a/src/login/logind-seat-dbus.c
b/src/login/logind-seat-dbus.c
index 909007c30c95296588581140cad9e6462b5d6a32..82323d6b8770e796f796e8ec4c384f388dac2c6e 100644
(file)
--- a/
src/login/logind-seat-dbus.c
+++ b/
src/login/logind-seat-dbus.c
@@
-27,6
+27,7
@@
#include "bus-util.h"
#include "strv.h"
#include "bus-errors.h"
#include "bus-util.h"
#include "strv.h"
#include "bus-errors.h"
+#include "bus-label.h"
#include "logind.h"
#include "logind-seat.h"
#include "logind.h"
#include "logind-seat.h"
@@
-201,7
+202,7
@@
static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
assert(message);
assert(s);
assert(message);
assert(s);
- r = seat_stop_sessions(s);
+ r = seat_stop_sessions(s
, true
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-356,7
+357,7
@@
int seat_object_find(sd_bus *bus, const char *path, const char *interface, void
if (!p)
return 0;
if (!p)
return 0;
- e =
sd_
bus_label_unescape(p);
+ e = bus_label_unescape(p);
if (!e)
return -ENOMEM;
if (!e)
return -ENOMEM;
@@
-374,7
+375,7
@@
char *seat_bus_path(Seat *s) {
assert(s);
assert(s);
- t =
sd_
bus_label_escape(s->id);
+ t = bus_label_escape(s->id);
if (!t)
return NULL;
if (!t)
return NULL;
@@
-399,11
+400,9
@@
int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- r = strv_push(&l, p);
- if (r < 0) {
- free(p);
+ r = strv_consume(&l, p);
+ if (r < 0)
return r;
return r;
- }
}
*nodes = l;
}
*nodes = l;