alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

input/keyboard: cleanup xkb_file error handing

Browse source 
This fixes an inverted fclose return value check and simplifies the
error handling and logging for xkb_file in sway_keyboard_compile_keymap
This commit is contained in:
Brian Ashworth 2019-11-20 22:41:41 -05:00 committed by Drew DeVault
parent ba8586e282
commit 66725f2e27
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/input/keyboard.c
View file

@ -581,20 +581,15 @@ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
if (ic && ic->xkb_file) { if (ic && ic->xkb_file) {
FILE *keymap_file = fopen(ic->xkb_file, "r"); FILE *keymap_file = fopen(ic->xkb_file, "r");
if (!keymap_file) { if (!keymap_file) {
sway_log_errno(SWAY_ERROR, "cannot read xkb file %s", ic->xkb_file);
if (error) { if (error) {
size_t len = snprintf(NULL, 0, "cannot read XKB file %s: %s", size_t len = snprintf(NULL, 0, "cannot read xkb file %s: %s",
ic->xkb_file, strerror(errno)) + 1; ic->xkb_file, strerror(errno)) + 1;
*error = malloc(len); *error = malloc(len);
if (*error) { if (*error) {
snprintf(*error, len, "cannot read XKB file %s: %s", snprintf(*error, len, "cannot read xkb_file %s: %s",
ic->xkb_file, strerror(errno));
} else {
sway_log_errno(SWAY_ERROR, "cannot read XKB file %s: %s",
ic->xkb_file, strerror(errno)); ic->xkb_file, strerror(errno));
} }
} else {
sway_log_errno(SWAY_ERROR, "cannot read XKB file %s: %s",
ic->xkb_file, strerror(errno));
} }
goto cleanup; goto cleanup;
} }
@ -602,9 +597,9 @@ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
keymap = xkb_keymap_new_from_file(context, keymap_file, keymap = xkb_keymap_new_from_file(context, keymap_file,
XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS); XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!fclose(keymap_file)) { if (fclose(keymap_file) != 0) {
sway_log_errno(SWAY_ERROR, "cannot close XKB file %s: %s", sway_log_errno(SWAY_ERROR, "Failed to close xkb file %s",
ic->xkb_file, strerror(errno)); ic->xkb_file);
} }
} else { } else {
struct xkb_rule_names rules = {0}; struct xkb_rule_names rules = {0};