core: dbus - use set_ensure_put
This commit is contained in:
+6
-8
@@ -679,12 +679,6 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = set_ensure_allocated(&m->private_buses, NULL);
|
||||
if (r < 0) {
|
||||
log_oom();
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = sd_bus_new(&bus);
|
||||
if (r < 0) {
|
||||
log_warning_errno(r, "Failed to allocate new private connection bus: %m");
|
||||
@@ -752,13 +746,17 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = set_put(m->private_buses, bus);
|
||||
r = set_ensure_put(&m->private_buses, NULL, bus);
|
||||
if (r == -ENOMEM) {
|
||||
log_oom();
|
||||
return 0;
|
||||
}
|
||||
if (r < 0) {
|
||||
log_warning_errno(r, "Failed to add new connection bus to set: %m");
|
||||
return 0;
|
||||
}
|
||||
|
||||
bus = NULL;
|
||||
TAKE_PTR(bus);
|
||||
|
||||
log_debug("Accepted new private connection.");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user