shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

devnode-acl: use set_put_strdup_full() and set_ensure_consume()

Browse Source
This commit is contained in:
Yu Watanabe 2022-06-03 18:01:35 +09:00
parent 8bf796eeac
commit c07eb49aff
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/devnode-acl.c
View File

@ -141,16 +141,12 @@ int devnode_acl_all(const char *seat,
bool add, uid_t new_uid) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
_cleanup_set_free_free_ Set *nodes = NULL;
_cleanup_set_free_ Set *nodes = NULL;
_cleanup_closedir_ DIR *dir = NULL;
sd_device *d;
char *n;
int r;
nodes = set_new(&path_hash_ops);
if (!nodes)
return -ENOMEM;
r = sd_device_enumerator_new(&e);
if (r < 0)
return r;
@ -185,7 +181,7 @@ int devnode_acl_all(const char *seat,
continue;
log_device_debug(d, "Found udev node %s for seat %s", node, seat);
r = set_put_strdup(&nodes, node);
r = set_put_strdup_full(&nodes, &path_hash_ops_free, node);
if (r < 0)
return r;
}
@ -206,7 +202,7 @@ int devnode_acl_all(const char *seat,
}
log_debug("Found static node %s for seat %s", n, seat);
r = set_consume(nodes, n);
r = set_ensure_consume(&nodes, &path_hash_ops_free, n);
if (r < 0)
return r;
}