SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kbd-util: use string_hash_ops_free and set_to_strv()

Browse Source
This commit is contained in:
Yu Watanabe
2025-04-13 04:59:26 +09:00
parent 21d84e8905
commit 002ff90d8c
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/kbd-util.c
+3 -7
View File
@@ -83,7 +83,7 @@ static int keymap_recurse_dir_callback(
}
int get_keymaps(char ***ret) {
_cleanup_set_free_free_ Set *keymaps = NULL;
_cleanup_set_free_ Set *keymaps = NULL;
_cleanup_strv_free_ char **keymap_dirs = NULL;
int r;
@@ -91,7 +91,7 @@ int get_keymaps(char ***ret) {
if (r < 0)
return r;
keymaps = set_new(&string_hash_ops);
keymaps = set_new(&string_hash_ops_free);
if (!keymaps)
return -ENOMEM;
@@ -114,14 +114,10 @@ int get_keymaps(char ***ret) {
log_debug_errno(r, "Failed to read keymap list from %s, ignoring: %m", *dir);
}
_cleanup_strv_free_ char **l = set_get_strv(keymaps);
_cleanup_strv_free_ char **l = set_to_strv(&keymaps);
if (!l)
return -ENOMEM;
keymaps = set_free(keymaps); /* If we got the strv above, then do a set_free() rather than
* set_free_free() since the entries of the set are now owned by the
* strv */
if (strv_isempty(l))
return -ENOENT;