Commit a2e597675b9b760b7d9a0be383c46c17f463b4e5
2009-04-04T12:50:27
xkbcomp: Don't say we're exiting when we're not
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 6e53562..077ffbe 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -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)
diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 616525e..377081d 100644
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -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)
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index a90066a..4b00ebf 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -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;
}
}
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 3200667..bbcad35 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -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);