chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce udev object cleanup functions
[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 82f25a0d1cfeb8694a94caf2f4958386d8204d19..230f7f082a21619f17d437f08dc519ab352d2b8c 100644
(file)
--- a/
src/login/logind-seat-dbus.c
+++ b/
src/login/logind-seat-dbus.c
@@
-61,7
+61,7
@@
static int bus_seat_append_active(DBusMessageIter *i, const char *property, void
DBusMessageIter sub;
Seat *s = data;
const char *id, *path;
DBusMessageIter sub;
Seat *s = data;
const char *id, *path;
-
char _cleanup_free_
*p = NULL;
+
_cleanup_free_ char
*p = NULL;
assert(i);
assert(property);
assert(i);
assert(property);
@@
-104,7
+104,7
@@
static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, vo
return -ENOMEM;
LIST_FOREACH(sessions_by_seat, session, s->sessions) {
return -ENOMEM;
LIST_FOREACH(sessions_by_seat, session, s->sessions) {
-
char _cleanup_free_
*p = NULL;
+
_cleanup_free_ char
*p = NULL;
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2))
return -ENOMEM;
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2))
return -ENOMEM;
@@
-209,8
+209,8
@@
static int bus_seat_append_idle_hint_since(DBusMessageIter *i, const char *prope
}
static int get_seat_for_path(Manager *m, const char *path, Seat **_s) {
}
static int get_seat_for_path(Manager *m, const char *path, Seat **_s) {
+ _cleanup_free_ char *id = NULL;
Seat *s;
Seat *s;
- char *id;
assert(m);
assert(path);
assert(m);
assert(path);
@@
-224,8
+224,6
@@
static int get_seat_for_path(Manager *m, const char *path, Seat **_s) {
return -ENOMEM;
s = hashmap_get(m->seats, id);
return -ENOMEM;
s = hashmap_get(m->seats, id);
- free(id);
-
if (!s)
return -ENOENT;
if (!s)
return -ENOENT;
@@
-348,7
+346,7
@@
const DBusObjectPathVTable bus_seat_vtable = {
};
char *seat_bus_path(Seat *s) {
};
char *seat_bus_path(Seat *s) {
-
char _cleanup_free_ *t
;
+
_cleanup_free_ char *t = NULL
;
assert(s);
assert(s);