From a2e597675b9b760b7d9a0be383c46c17f463b4e5 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat, 4 Apr 2009 12:50:27 -0700
Subject: [PATCH] xkbcomp: Don't say we're exiting when we're not

---
 src/xkbcomp/compat.c   | 1 -
 src/xkbcomp/keytypes.c | 2 --
 src/xkbcomp/misc.c     | 3 ---
 src/xkbcomp/vmod.c     | 1 -
 4 files changed, 7 deletions(-)

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);
-- 
2.7.4