xkbcomp: Don't say we're exiting when we're not
parent
85039a0d76
commit
a2e597675b
|
@ -823,7 +823,6 @@ CompileCompatMap(XkbFile *file, XkbcDescPtr xkb, unsigned merge,
|
|||
Success)
|
||||
{
|
||||
WSGO("Couldn't allocate compatibility map\n");
|
||||
ACTION("Exiting\n");
|
||||
return False;
|
||||
}
|
||||
if (info.name != NULL)
|
||||
|
|
|
@ -1233,7 +1233,6 @@ CompileKeyTypes(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
|
|||
if (XkbcAllocClientMap(xkb, XkbKeyTypesMask, i) != Success)
|
||||
{
|
||||
WSGO("Couldn't allocate client map\n");
|
||||
ACTION("Exiting\n");
|
||||
return False;
|
||||
}
|
||||
xkb->map->num_types = i;
|
||||
|
@ -1246,7 +1245,6 @@ CompileKeyTypes(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
|
|||
if (XkbcInitCanonicalKeyTypes(xkb, missing, keypadVMod) != Success)
|
||||
{
|
||||
WSGO("Couldn't initialize canonical key types\n");
|
||||
ACTION("Exiting\n");
|
||||
return False;
|
||||
}
|
||||
if (missing & XkbOneLevelMask)
|
||||
|
|
|
@ -68,7 +68,6 @@ ProcessIncludeFile(IncludeStmt * stmt,
|
|||
{
|
||||
ERROR("Can't find file \"%s\" for %s include\n", stmt->file,
|
||||
XkbDirectoryForInclude(file_type));
|
||||
ACTION("Exiting\n");
|
||||
return False;
|
||||
}
|
||||
strcpy(oldFile, scanFile);
|
||||
|
@ -81,7 +80,6 @@ ProcessIncludeFile(IncludeStmt * stmt,
|
|||
{
|
||||
setScanState(oldFile, oldLine);
|
||||
ERROR("Error interpreting include file \"%s\"\n", stmt->file);
|
||||
ACTION("Exiting\n");
|
||||
fclose(file);
|
||||
return False;
|
||||
}
|
||||
|
@ -100,7 +98,6 @@ ProcessIncludeFile(IncludeStmt * stmt,
|
|||
{
|
||||
ERROR("No %s named \"%s\" in the include file \"%s\"\n",
|
||||
XkbcConfigText(file_type), stmt->map, stmt->file);
|
||||
ACTION("Exiting\n");
|
||||
return False;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -133,7 +133,6 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
|
|||
{
|
||||
ERROR("Too many virtual modifiers defined (maximum %d)\n",
|
||||
XkbNumVirtualMods);
|
||||
ACTION("Exiting\n");
|
||||
return False;
|
||||
}
|
||||
info->defined |= (1 << nextFree);
|
||||
|
|
Loading…
Reference in New Issue