Replace WARN[1-9], ERROR[1-9], etc. with their unnumbered version

Those macros date back to when varargs weren't a thing but they've
been #defined to the same value for 17 years now.

Patch generated with:
	for action in WARN INFO ERROR ACTION FATAL WSGO; do
	sed -i "s/${action}[1-9]/${action}/g" `git ls-files`
	done

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 103 insertions, 103 deletions

diff --git a/geometry.c b/geometry.c
index b01bc99..a759616 100644
--- a/geometry.c
+++ b/geometry.c
@@ -744,9 +744,9 @@ AddProperty(GeometryInfo * info, PropertyInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Multiple definitions for the \"%s\" property\n",
+                WARN("Multiple definitions for the \"%s\" property\n",
                       new->name);
-                ACTION2("Ignoring \"%s\", using \"%s\"\n", old->value,
+                ACTION("Ignoring \"%s\", using \"%s\"\n", old->value,
                         new->value);
             }
             if (old->value)
@@ -757,8 +757,8 @@ AddProperty(GeometryInfo * info, PropertyInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple definitions for \"%s\" property\n", new->name);
-            ACTION2("Using \"%s\", ignoring \"%s\" \n", old->value,
+            WARN("Multiple definitions for \"%s\" property\n", new->name);
+            ACTION("Using \"%s\", ignoring \"%s\" \n", old->value,
                     new->value);
         }
         return True;
@@ -804,11 +804,11 @@ FindShape(GeometryInfo * info, Atom name, const char *type, const char *which)
     if (type != NULL)
     {
         old = info->shapes;
-        WARN3("Unknown shape \"%s\" for %s %s\n",
+        WARN("Unknown shape \"%s\" for %s %s\n",
               XkbAtomText(info->dpy, name, XkbMessage), type, which);
         if (old)
         {
-            ACTION1("Using default shape %s instead\n",
+            ACTION("Using default shape %s instead\n",
                     shText(info->dpy, old));
             return old;
         }
@@ -833,7 +833,7 @@ AddShape(GeometryInfo * info, ShapeInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Duplicate shape name \"%s\"\n",
+                WARN("Duplicate shape name \"%s\"\n",
                       shText(info->dpy, old));
                 ACTION("Using last definition\n");
             }
@@ -844,7 +844,7 @@ AddShape(GeometryInfo * info, ShapeInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
+            WARN("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
             ACTION("Using first definition\n");
         }
         return True;
@@ -940,7 +940,7 @@ AddDoodad(SectionInfo * si, GeometryInfo * info, DoodadInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Multiple doodads named \"%s\"\n",
+                WARN("Multiple doodads named \"%s\"\n",
                       XkbAtomText(info->dpy, old->name, XkbMessage));
                 ACTION("Using last definition\n");
             }
@@ -951,7 +951,7 @@ AddDoodad(SectionInfo * si, GeometryInfo * info, DoodadInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple doodads named \"%s\"\n",
+            WARN("Multiple doodads named \"%s\"\n",
                   XkbAtomText(info->dpy, old->name, XkbMessage));
             ACTION("Using first definition\n");
         }
@@ -1023,7 +1023,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN2
+                WARN
                     ("Multiple overlays named \"%s\" for section \"%s\"\n",
                      XkbAtomText(info->dpy, old->name, XkbMessage),
                      XkbAtomText(info->dpy, si->name, XkbMessage));
@@ -1039,7 +1039,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN2("Multiple doodads named \"%s\" in section \"%s\"\n",
+            WARN("Multiple doodads named \"%s\" in section \"%s\"\n",
                   XkbAtomText(info->dpy, old->name, XkbMessage),
                   XkbAtomText(info->dpy, si->name, XkbMessage));
             ACTION("Using first definition\n");
@@ -1053,7 +1053,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new)
         if (warningLevel > 0)
         {
             WSGO("Couldn't allocate a new OverlayInfo\n");
-            ACTION2
+            ACTION
                 ("Overlay \"%s\" in section \"%s\" will be incomplete\n",
                  XkbAtomText(info->dpy, old->name, XkbMessage),
                  XkbAtomText(info->dpy, si->name, XkbMessage));
@@ -1122,7 +1122,7 @@ AddSection(GeometryInfo * info, SectionInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Duplicate shape name \"%s\"\n",
+                WARN("Duplicate shape name \"%s\"\n",
                       shText(info->dpy, old));
                 ACTION("Using last definition\n");
             }
@@ -1133,7 +1133,7 @@ AddSection(GeometryInfo * info, SectionInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
+            WARN("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
             ACTION("Using first definition\n");
         }
         return True;
@@ -1808,9 +1808,9 @@ SetDoodadField(DoodadInfo * di,
         if ((tmp.ival < 0) || (tmp.ival > XkbGeomMaxPriority))
         {
             info->errorCount++;
-            ERROR2("Doodad priority %d out of range (must be 0..%d)\n",
+            ERROR("Doodad priority %d out of range (must be 0..%d)\n",
                    tmp.ival, XkbGeomMaxPriority);
-            ACTION1("Priority for doodad %s not changed",
+            ACTION("Priority for doodad %s not changed",
                     ddText(info->dpy, di));
             return False;
         }
@@ -1881,9 +1881,9 @@ SetDoodadField(DoodadInfo * di,
     case XkbLogoDoodad:
         return SetLogoDoodadField(di, field, arrayNdx, value, si, info);
     }
-    WSGO1("Unknown doodad type %d in SetDoodadField\n",
+    WSGO("Unknown doodad type %d in SetDoodadField\n",
           (unsigned int) di->type);
-    ACTION2("Definition of %s in %s ignored\n", field, ddText(info->dpy, di));
+    ACTION("Definition of %s in %s ignored\n", field, ddText(info->dpy, di));
     return False;
 }
 
@@ -1916,9 +1916,9 @@ SetSectionField(SectionInfo * si,
         if ((tmp.ival < 0) || (tmp.ival > XkbGeomMaxPriority))
         {
             info->errorCount++;
-            ERROR2("Section priority %d out of range (must be 0..%d)\n",
+            ERROR("Section priority %d out of range (must be 0..%d)\n",
                    tmp.ival, XkbGeomMaxPriority);
-            ACTION1("Priority for section %s not changed",
+            ACTION("Priority for section %s not changed",
                     scText(info->dpy, si));
             return False;
         }
@@ -2131,7 +2131,7 @@ SetGeometryProperty(GeometryInfo * info, char *property, ExprDef * value)
     {
         info->errorCount++;
         ERROR("Property values must be type string\n");
-        ACTION1("Ignoring illegal definition of \"%s\" property\n", property);
+        ACTION("Ignoring illegal definition of \"%s\" property\n", property);
         return False;
     }
     pi.value = result.str;
@@ -2166,7 +2166,7 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if (ndx != NULL)
         {
             info->errorCount++;
-            ERROR1("The %s geometry property is not an array\n", field.str);
+            ERROR("The %s geometry property is not an array\n", field.str);
             ACTION("Ignoring illegal property definition\n");
             return False;
         }
@@ -2220,7 +2220,7 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
     if (elem.str)
     {
         WARN("Assignment to field of unknown element\n");
-        ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+        ACTION("No value assigned to %s.%s\n", elem.str, field.str);
         return False;
     }
 
@@ -2240,16 +2240,16 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if (tmp.ival < 1)
         {
             WARN("Keyboard width must be positive\n");
-            ACTION1("Ignoring illegal keyboard width %s\n",
+            ACTION("Ignoring illegal keyboard width %s\n",
                     XkbGeomFPText(tmp.ival, XkbMessage));
             return True;
         }
         if (info->widthMM != 0)
         {
             WARN("Keyboard width multiply defined\n");
-            ACTION1("Using last definition (%s),",
+            ACTION("Using last definition (%s),",
                     XkbGeomFPText(tmp.ival, XkbMessage));
-            INFO1(" ignoring first (%s)\n",
+            INFO(" ignoring first (%s)\n",
                   XkbGeomFPText(info->widthMM, XkbMessage));
         }
         info->widthMM = tmp.ival;
@@ -2271,16 +2271,16 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if (tmp.ival < 1)
         {
             WARN("Keyboard height must be positive\n");
-            ACTION1("Ignoring illegal keyboard height %s\n",
+            ACTION("Ignoring illegal keyboard height %s\n",
                     XkbGeomFPText(tmp.ival, XkbMessage));
             return True;
         }
         if (info->heightMM != 0)
         {
             WARN("Keyboard height multiply defined\n");
-            ACTION1("Using last definition (%s),",
+            ACTION("Using last definition (%s),",
                     XkbGeomFPText(tmp.ival, XkbMessage));
-            INFO1(" ignoring first (%s)\n",
+            INFO(" ignoring first (%s)\n",
                   XkbGeomFPText(info->heightMM, XkbMessage));
         }
         info->heightMM = tmp.ival;
@@ -2330,7 +2330,7 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if ((tmp.ival < 40) || (tmp.ival > 2550))
         {
             info->errorCount++;
-            ERROR1("Illegal font size %d (must be 4..255)\n", tmp.ival);
+            ERROR("Illegal font size %d (must be 4..255)\n", tmp.ival);
             ACTION("Ignoring font size in keyboard geometry\n");
             return False;
         }
@@ -2400,7 +2400,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
 
     if (def->nOutlines < 1)
     {
-        WARN1("Shape \"%s\" has no outlines\n", shText(info->dpy, si));
+        WARN("Shape \"%s\" has no outlines\n", shText(info->dpy, si));
         ACTION("Definition ignored\n");
         return True;
     }
@@ -2408,7 +2408,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
     si->outlines = uTypedCalloc(def->nOutlines, XkbOutlineRec);
     if (!si->outlines)
     {
-        ERROR1("Couldn't allocate outlines for \"%s\"\n",
+        ERROR("Couldn't allocate outlines for \"%s\"\n",
                shText(info->dpy, si));
         ACTION("Definition ignored\n");
         info->errorCount++;
@@ -2429,7 +2429,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
         outline->points = uTypedCalloc(ol->nPoints, XkbPointRec);
         if (!outline->points)
         {
-            ERROR1("Can't allocate points for \"%s\"\n",
+            ERROR("Can't allocate points for \"%s\"\n",
                    shText(info->dpy, si));
             ACTION("Definition ignored\n");
             info->errorCount++;
@@ -2452,7 +2452,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
                     si->approx = outline;
                 else
                 {
-                    WARN1("Multiple approximations for \"%s\"\n",
+                    WARN("Multiple approximations for \"%s\"\n",
                           shText(info->dpy, si));
                     ACTION("Treating all but the first as normal outlines\n");
                 }
@@ -2463,14 +2463,14 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
                     si->primary = outline;
                 else
                 {
-                    WARN1("Multiple primary outlines for \"%s\"\n",
+                    WARN("Multiple primary outlines for \"%s\"\n",
                           shText(info->dpy, si));
                     ACTION("Treating all but the first as normal outlines\n");
                 }
             }
             else
             {
-                WARN2("Unknown outline type %s for \"%s\"\n", str,
+                WARN("Unknown outline type %s for \"%s\"\n", str,
                       shText(info->dpy, si));
                 ACTION("Treated as a normal outline\n");
             }
@@ -2478,7 +2478,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
     }
     if (nOut != si->nOutlines)
     {
-        WSGO2("Expected %d outlines, got %d\n",
+        WSGO("Expected %d outlines, got %d\n",
               (unsigned int) si->nOutlines, nOut);
         si->nOutlines = nOut;
     }
@@ -2531,9 +2531,9 @@ HandleDoodadDef(DoodadDef * def,
             return 0;           /* internal error, already reported */
         if (elem.str != NULL)
         {
-            WARN1("Assignment to field of unknown element in doodad %s\n",
+            WARN("Assignment to field of unknown element in doodad %s\n",
                   ddText(info->dpy, &new));
-            ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+            ACTION("No value assigned to %s.%s\n", elem.str, field.str);
         }
         else if (!SetDoodadField(&new, field.str, ndx, var->value, si, info))
             return False;
@@ -2556,7 +2556,7 @@ HandleOverlayDef(OverlayDef * def,
 
     if ((def->nKeys < 1) && (warningLevel > 3))
     {
-        WARN2("Overlay \"%s\" in section \"%s\" has no keys\n",
+        WARN("Overlay \"%s\" in section \"%s\" has no keys\n",
               XkbAtomText(NULL, def->name, XkbMessage), scText(info->dpy,
                                                                si));
         ACTION("Overlay ignored\n");
@@ -2572,7 +2572,7 @@ HandleOverlayDef(OverlayDef * def,
         if ((!key) && warningLevel > 0)
         {
             WSGO("Couldn't allocate OverlayKeyInfo\n");
-            ACTION2("Overlay %s for section %s will be incomplete\n",
+            ACTION("Overlay %s for section %s will be incomplete\n",
                     XkbAtomText(info->dpy, ol.name, XkbMessage),
                     scText(info->dpy, si));
             return False;
@@ -2617,7 +2617,7 @@ HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info)
             else
             {
                 ERROR("Illegal element used in a key definition\n");
-                ACTION2("Assignment to %s.%s ignored\n", elem.str, f.str);
+                ACTION("Assignment to %s.%s ignored\n", elem.str, f.str);
                 return False;
             }
         }
@@ -2640,7 +2640,7 @@ HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info)
                 break;
             default:
                 ERROR("Cannot determine field for unnamed expression\n");
-                ACTION3("Ignoring key %d in row %d of section %s\n",
+                ACTION("Ignoring key %d in row %d of section %s\n",
                         row->nKeys + 1, row->section->nRows + 1,
                         rowText(info->dpy, row));
                 return False;
@@ -2658,7 +2658,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
 
     if ((def->nKeys < 1) && (warningLevel > 3))
     {
-        ERROR1("Row in section %s has no keys\n", rowText(info->dpy, row));
+        ERROR("Row in section %s has no keys\n", rowText(info->dpy, row));
         ACTION("Section ignored\n");
         return True;
     }
@@ -2686,7 +2686,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
             else
             {
                 WARN("Assignment to field of unknown element in row\n");
-                ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+                ACTION("No value assigned to %s.%s\n", elem.str, field.str);
             }
         }
         else if (keyDef->common.stmtType == StmtKeyDef)
@@ -2698,7 +2698,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
                 int len = strlen(keyDef->name);
                 if ((len < 1) || (len > XkbKeyNameLength))
                 {
-                    ERROR2("Illegal name %s for key in section %s\n",
+                    ERROR("Illegal name %s for key in section %s\n",
                            keyDef->name, rowText(info->dpy, row));
                     ACTION("Section not compiled\n");
                     return False;
@@ -2714,7 +2714,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
         }
         else
         {
-            WSGO1("Unexpected statement (type %d) in row body\n",
+            WSGO("Unexpected statement (type %d) in row body\n",
                   keyDef->common.stmtType);
             return False;
         }
@@ -2765,7 +2765,7 @@ HandleSectionBody(SectionDef * def,
             else
             {
                 WARN("Assignment to field of unknown element in section\n");
-                ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+                ACTION("No value assigned to %s.%s\n", elem.str, field.str);
             }
         }
         else if (rowDef->common.stmtType == StmtRowDef)
@@ -2791,16 +2791,16 @@ HandleSectionBody(SectionDef * def,
         }
         else
         {
-            WSGO1("Unexpected statement (type %d) in section body\n",
+            WSGO("Unexpected statement (type %d) in section body\n",
                   rowDef->common.stmtType);
             return False;
         }
     }
     if (si->nRows != def->nRows)
     {
-        WSGO2("Expected %d rows, found %d\n", (unsigned int) def->nRows,
+        WSGO("Expected %d rows, found %d\n", (unsigned int) def->nRows,
               (unsigned int) si->nRows);
-        ACTION1("Definition of section %s might be incorrect\n",
+        ACTION("Definition of section %s might be incorrect\n",
                 scText(info->dpy, si));
     }
     return True;
@@ -2893,11 +2893,11 @@ HandleGeometryFile(XkbFile * file,
             if (!failWhat)
                 failWhat = "key name";
             ERROR("Interpretation files may not include other types\n");
-            ACTION1("Ignoring %s definition.\n", failWhat);
+            ACTION("Ignoring %s definition.\n", failWhat);
             info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleGeometryFile\n",
+            WSGO("Unexpected statement type %d in HandleGeometryFile\n",
                   stmt->stmtType);
             break;
         }
@@ -2907,7 +2907,7 @@ HandleGeometryFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning geometry file \"%s\"\n", file->topName);
+            ACTION("Abandoning geometry file \"%s\"\n", file->topName);
             break;
         }
     }
@@ -2930,7 +2930,7 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si)
     if (!shape)
     {
         WSGO("Couldn't allocate shape in geometry\n");
-        ACTION1("Shape %s not compiled\n", shText(dpy, si));
+        ACTION("Shape %s not compiled\n", shText(dpy, si));
         return False;
     }
     old_outline = si->outlines;
@@ -2940,7 +2940,7 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si)
         if (!outline)
         {
             WSGO("Couldn't allocate outline in shape\n");
-            ACTION1("Shape %s is incomplete\n", shText(dpy, si));
+            ACTION("Shape %s is incomplete\n", shText(dpy, si));
             return False;
         }
         n = old_outline->num_points;
@@ -2969,7 +2969,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     {
         if (warningLevel < 9)
         {
-            ERROR1("No position defined for doodad %s\n",
+            ERROR("No position defined for doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Illegal doodad ignored\n");
             return False;
@@ -2985,7 +2985,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbSolidDoodad:
         if ((di->defs.defined & _GD_Shape) == 0)
         {
-            ERROR2("No shape defined for %s doodad %s\n",
+            ERROR("No shape defined for %s doodad %s\n",
                    (di->type == XkbOutlineDoodad ? "outline" : "filled"),
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
@@ -3002,7 +3002,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 di->shape = si->name;
             else
             {
-                ERROR1("No legal shape for %s\n", ddText(info->dpy, di));
+                ERROR("No legal shape for %s\n", ddText(info->dpy, di));
                 ACTION("Incomplete definition ignored\n");
                 return False;
             }
@@ -3011,7 +3011,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No color for doodad %s\n", ddText(info->dpy, di));
+                WARN("No color for doodad %s\n", ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
             di->color = XkbInternAtom(NULL, "black", False);
@@ -3020,7 +3020,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbTextDoodad:
         if ((di->defs.defined & _GD_Text) == 0)
         {
-            ERROR1("No text specified for text doodad %s\n",
+            ERROR("No text specified for text doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Illegal doodad definition ignored\n");
             return False;
@@ -3031,7 +3031,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No color specified for doodad %s\n",
+                WARN("No color specified for doodad %s\n",
                       ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
@@ -3043,7 +3043,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 return True;
             if (warningLevel < 9)
             {
-                WARN1
+                WARN
                     ("Text doodad %s has full and partial font definition\n",
                      ddText(info->dpy, di));
                 ACTION("Full specification ignored\n");
@@ -3055,9 +3055,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No font specified for doodad %s\n",
+                WARN("No font specified for doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_FONT);
+                ACTION("Using \"%s\"\n", DFLT_FONT);
             }
             di->font = XkbInternAtom(NULL, DFLT_FONT, False);
         }
@@ -3065,9 +3065,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font slant for text doodad %s\n",
+                WARN("No font slant for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_SLANT);
+                ACTION("Using \"%s\"\n", DFLT_SLANT);
             }
             di->fontSlant = XkbInternAtom(NULL, DFLT_SLANT, False);
         }
@@ -3075,9 +3075,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font weight for text doodad %s\n",
+                WARN("No font weight for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_WEIGHT);
+                ACTION("Using \"%s\"\n", DFLT_WEIGHT);
             }
             di->fontWeight = XkbInternAtom(NULL, DFLT_WEIGHT, False);
         }
@@ -3085,9 +3085,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 9)
             {
-                WARN1("No font set width for text doodad %s\n",
+                WARN("No font set width for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_SET_WIDTH);
+                ACTION("Using \"%s\"\n", DFLT_SET_WIDTH);
             }
             di->fontSetWidth = XkbInternAtom(NULL, DFLT_SET_WIDTH, False);
         }
@@ -3095,9 +3095,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 9)
             {
-                WARN1("No font variant for text doodad %s\n",
+                WARN("No font variant for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_VARIANT);
+                ACTION("Using \"%s\"\n", DFLT_VARIANT);
             }
             di->fontVariant = XkbInternAtom(NULL, DFLT_VARIANT, False);
         }
@@ -3105,9 +3105,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font encoding for doodad %s\n",
+                WARN("No font encoding for doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_ENCODING);
+                ACTION("Using \"%s\"\n", DFLT_ENCODING);
             }
             di->fontEncoding = XkbInternAtom(NULL, DFLT_ENCODING, False);
         }
@@ -3115,9 +3115,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font size for text doodad %s\n",
+                WARN("No font size for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using %s point text\n",
+                ACTION("Using %s point text\n",
                         XkbGeomFPText(DFLT_SIZE, XkbMessage));
             }
             di->fontSize = DFLT_SIZE;
@@ -3137,9 +3137,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
             size *= nLines;
             if (warningLevel > 5)
             {
-                WARN1("No height for text doodad %s\n",
+                WARN("No height for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using calculated height %s millimeters\n",
+                ACTION("Using calculated height %s millimeters\n",
                         XkbGeomFPText(size, XkbMessage));
             }
             di->height = size;
@@ -3165,8 +3165,8 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
             width *= (di->height * 2) / 3;
             if (warningLevel > 5)
             {
-                WARN1("No width for text doodad %s\n", ddText(info->dpy, di));
-                ACTION1("Using calculated width %s millimeters\n",
+                WARN("No width for text doodad %s\n", ddText(info->dpy, di));
+                ACTION("Using calculated width %s millimeters\n",
                         XkbGeomFPText(width, XkbMessage));
             }
             di->width = width;
@@ -3175,7 +3175,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbIndicatorDoodad:
         if ((di->defs.defined & _GD_Shape) == 0)
         {
-            ERROR1("No shape defined for indicator doodad %s\n",
+            ERROR("No shape defined for indicator doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
             return False;
@@ -3189,7 +3189,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 di->shape = si->name;
             else
             {
-                ERROR1("No legal shape for doodad %s\n",
+                ERROR("No legal shape for doodad %s\n",
                        ddText(info->dpy, di));
                 ACTION("Incomplete definition ignored\n");
                 return False;
@@ -3199,7 +3199,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No \"on\" color for indicator doodad %s\n",
+                WARN("No \"on\" color for indicator doodad %s\n",
                       ddText(info->dpy, di));
                 ACTION("Using green\n");
             }
@@ -3209,7 +3209,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No \"off\" color for indicator doodad %s\n",
+                WARN("No \"off\" color for indicator doodad %s\n",
                       ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
@@ -3219,14 +3219,14 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbLogoDoodad:
         if (di->logoName == NULL)
         {
-            ERROR1("No logo name defined for logo doodad %s\n",
+            ERROR("No logo name defined for logo doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
             return False;
         }
         if ((di->defs.defined & _GD_Shape) == 0)
         {
-            ERROR1("No shape defined for logo doodad %s\n",
+            ERROR("No shape defined for logo doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
             return False;
@@ -3240,7 +3240,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 di->shape = si->name;
             else
             {
-                ERROR1("No legal shape for %s\n", ddText(info->dpy, di));
+                ERROR("No legal shape for %s\n", ddText(info->dpy, di));
                 ACTION("Incomplete definition ignored\n");
                 return False;
             }
@@ -3249,14 +3249,14 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No color for doodad %s\n", ddText(info->dpy, di));
+                WARN("No color for doodad %s\n", ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
             di->color = XkbInternAtom(NULL, "black", False);
         }
         break;
     default:
-        WSGO1("Unknown doodad type %d in VerifyDoodad\n",
+        WSGO("Unknown doodad type %d in VerifyDoodad\n",
               (unsigned int) di->type);
         return False;
     }
@@ -3318,9 +3318,9 @@ CopyDoodadDef(XkbGeometryPtr geom,
     doodad = XkbAddGeomDoodad(geom, section, name);
     if (!doodad)
     {
-        WSGO1("Couldn't allocate doodad in %s\n",
+        WSGO("Couldn't allocate doodad in %s\n",
               (section ? "section" : "geometry"));
-        ACTION1("Cannot copy doodad %s\n", ddText(info->dpy, di));
+        ACTION("Cannot copy doodad %s\n", ddText(info->dpy, di));
         return False;
     }
     doodad->any.type = di->type;
@@ -3423,7 +3423,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
                 {
                     if (warningLevel > 0)
                     {
-                        WARN3
+                        WARN
                             ("Key %s in section \"%s\" and overlay \"%s\"\n",
                              XkbKeyNameText(key->name.name,
                                             XkbMessage),
@@ -3443,7 +3443,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
         }
         if ((ki->sectionRow == _GOK_UnknownRow) && (warningLevel > 0))
         {
-            WARN3
+            WARN
                 ("Key %s not in \"%s\", but has an overlay key in \"%s\"\n",
                  XkbKeyNameText(ki->under, XkbMessage),
                  XkbAtomText(info->dpy, section->name, XkbMessage),
@@ -3472,7 +3472,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
     }
     if (oi->nKeys < 1)
     {
-        ERROR2("Overlay \"%s\" for section \"%s\" has no legal keys\n",
+        ERROR("Overlay \"%s\" for section \"%s\" has no legal keys\n",
                XkbAtomText(info->dpy, oi->name, XkbMessage),
                XkbAtomText(info->dpy, section->name, XkbMessage));
         ACTION("Overlay definition ignored\n");
@@ -3513,7 +3513,7 @@ CopyOverlayDef(XkbGeometryPtr geom,
     ol = XkbAddGeomOverlay(section, name, oi->nRows);
     if (!ol)
     {
-        WSGO2("Couldn't add overlay \"%s\" to section \"%s\"\n",
+        WSGO("Couldn't add overlay \"%s\" to section \"%s\"\n",
               XkbAtomText(info->dpy, name, XkbMessage),
               XkbAtomText(info->dpy, section->name, XkbMessage));
         return False;
@@ -3529,7 +3529,7 @@ CopyOverlayDef(XkbGeometryPtr geom,
         }
         if (!XkbAddGeomOverlayRow(ol, row_under, rowSize[i]))
         {
-            WSGO3
+            WSGO
                 ("Can't add row %d to overlay \"%s\" of section \"%s\"\n",
                  i, XkbAtomText(info->dpy, name, XkbMessage),
                  XkbAtomText(info->dpy, section->name, XkbMessage));
@@ -3565,7 +3565,7 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
     if (section == NULL)
     {
         WSGO("Couldn't allocate section in geometry\n");
-        ACTION1("Section %s not compiled\n", scText(info->dpy, si));
+        ACTION("Section %s not compiled\n", scText(info->dpy, si));
         return False;
     }
     section->top = si->top;
@@ -3580,7 +3580,7 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
         if (row == NULL)
         {
             WSGO("Couldn't allocate row in section\n");
-            ACTION1("Section %s is incomplete\n", scText(info->dpy, si));
+            ACTION("Section %s is incomplete\n", scText(info->dpy, si));
             return False;
         }
         row->top = ri->top;
@@ -3591,17 +3591,17 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
             XkbColorPtr color;
             if ((ki->defs.defined & _GK_Name) == 0)
             {
-                ERROR3("Key %d of row %d in section %s has no name\n",
+                ERROR("Key %d of row %d in section %s has no name\n",
                        (int) ki->index, (int) ri->index,
                        scText(info->dpy, si));
-                ACTION1("Section %s ignored\n", scText(info->dpy, si));
+                ACTION("Section %s ignored\n", scText(info->dpy, si));
                 return False;
             }
             key = XkbAddGeomKey(row);
             if (key == NULL)
             {
                 WSGO("Couldn't allocate key in row\n");
-                ACTION1("Section %s is incomplete\n", scText(info->dpy, si));
+                ACTION("Section %s is incomplete\n", scText(info->dpy, si));
                 return False;
             }
             memcpy(key->name.name, ki->name, XkbKeyNameLength);