X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fkeymap%2Fkeymap.c;h=597a53b467c20094b0233fb4d234f2ec38d438d2;hb=135f3e8d0b4b4968908421b677c9ef2ba860b71d;hp=eabd1e44d823f768703cc74de0bb2a363b3c3280;hpb=7459bcdc8d12fdb217efd4a27a509f9f87ec7b1e;p=elogind.git

diff --git a/extras/keymap/keymap.c b/extras/keymap/keymap.c
index eabd1e44d..597a53b46 100644
--- 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;
 }