Merge pull request #16238 from keszybz/set-handling-more
Fix handling of cases where a duplicate item is added to a set and related cleanups
This commit is contained in:
+1
-7
@@ -377,15 +377,9 @@ static int userdb_connect(
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Failed to invoke varlink method: %m");
|
||||
|
||||
r = set_ensure_allocated(&iterator->links, &link_hash_ops);
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Failed to allocate set: %m");
|
||||
|
||||
r = set_put(iterator->links, vl);
|
||||
r = set_ensure_consume(&iterator->links, &link_hash_ops, TAKE_PTR(vl));
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Failed to add varlink connection to set: %m");
|
||||
|
||||
TAKE_PTR(vl);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user