chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'docs/udev.xml' of git://github.com/mfwitten/udev
[elogind.git]
/
extras
/
keymap
/
keymap.c
diff --git
a/extras/keymap/keymap.c
b/extras/keymap/keymap.c
index eabd1e44d823f768703cc74de0bb2a363b3c3280..597a53b467c20094b0233fb4d234f2ec38d438d2 100644
(file)
--- a/
extras/keymap/keymap.c
+++ b/
extras/keymap/keymap.c
@@
-192,8
+192,7
@@
static int merge_table(int fd, const char *filename) {
f = fopen(filename, "r");
if (!f) {
perror(filename);
- r = -1;
- goto fail;
+ return -1;
}
while (!feof(f)) {
@@
-243,6
+242,7
@@
static int merge_table(int fd, const char *filename) {
scancode, new_keycode, old_keycode);
}
fail:
+ fclose(f);
return r;
}