Signed-off-by: Ran Benita <ran234@gmail.com>
_X_EXPORT int
xkb_context_include_path_append_default(struct xkb_context *ctx)
{
- const char *home = getenv("HOME");
+ const char *home;
char *user_path;
int err;
*info_in = NULL;
return true;
}
+
status = XkbcAllocNames(keymap, XkbKeyAliasesMask, nOld + nNew);
- if (keymap->names)
- old = keymap->names->key_aliases;
if (status != Success)
{
WSGO("Allocation failure in ApplyAliases\n");
return false;
}
have = 0;
- ok = 1;
+
/* Check for duplicate entries in the input file */
for (file = (XkbFile *) file->defs; file; file = (XkbFile *) file->common.next)
{
/* Find map to use */
mapToUse = XkbChooseMap(file, NULL);
- if (!mapToUse || mapToUse->type != XkmKeymapFile) {
+ if (!mapToUse)
+ goto err;
+
+ if (mapToUse->type != XkmKeymapFile) {
ERROR("file type %d not handled\n", mapToUse->type);
goto err;
}