projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe28d88
)
locale: use _cleanup_free_ and free_and_replace
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Tue, 29 May 2018 16:35:26 +0000
(
01:35
+0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Thu, 31 May 2018 07:17:18 +0000
(16:17 +0900)
src/locale/keymap-util.c
patch
|
blob
|
history
diff --git
a/src/locale/keymap-util.c
b/src/locale/keymap-util.c
index
7cc2eb4
..
50f7a1b
100644
(file)
--- a/
src/locale/keymap-util.c
+++ b/
src/locale/keymap-util.c
@@
-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)