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

locale: use _cleanup_free_ and free_and_replace

Browse Source
This commit is contained in:
Yu Watanabe
2018-05-31 16:17:18 +09:00
parent fe28d88746
commit 6a837b035f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/locale/keymap-util.c
+3 -5
View File
@@ -668,7 +668,7 @@ int x11_convert_to_vconsole(Context *c) {
context_free_vconsole(c);
} else {
char *new_keymap = NULL;
_cleanup_free_ char *new_keymap = NULL;
int r;
r = find_converted_keymap(c->x11_layout, c->x11_variant, &new_keymap);
@@ -687,12 +687,10 @@ int x11_convert_to_vconsole(Context *c) {
c->x11_layout);
if (!streq_ptr(c->vc_keymap, new_keymap)) {
free(c->vc_keymap);
c->vc_keymap = new_keymap;
free_and_replace(c->vc_keymap, new_keymap);
c->vc_keymap_toggle = mfree(c->vc_keymap_toggle);
modified = true;
} else
free(new_keymap);
}
}
if (modified)