xkbcomp: Remove duplicated macros

[platform/upstream/libxkbcommon.git] / src / xkbcomp / keycodes.c

diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 82cff8f..0b4439a 100644 (file)
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -168,7 +168,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple indicators named %s\n", XkbcAtomText(new->name));
+            WARN("Multiple indicators named %s\n", XkbcAtomText(new->name));
             if (old->ndx == new->ndx)
             {
                 if (old->virtual != new->virtual)
@@ -181,7 +181,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
                 {
                     action = "Identical definitions ignored\n";
                 }
-                ACTION2(action, (old->virtual ? "virtual" : "real"),
+                ACTION(action, (old->virtual ? "virtual" : "real"),
                         (old->virtual ? "real" : "virtual"));
                 return True;
             }
@@ -191,7 +191,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
                     action = "Ignoring %d, using %d\n";
                 else
                     action = "Using %d, ignoring %d\n";
-                ACTION2(action, old->ndx, new->ndx);
+                ACTION(action, old->ndx, new->ndx);
             }
             if (replace)
             {
@@ -221,7 +221,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple names for indicator %d\n", new->ndx);
+            WARN("Multiple names for indicator %d\n", new->ndx);
             if ((old->name == new->name) && (old->virtual == new->virtual))
                 action = "Identical definitions ignored\n";
             else
@@ -246,7 +246,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
                     using = old->name;
                     ignoring = new->name;
                 }
-                ACTION4("Using %s %s, ignoring %s %s\n",
+                ACTION("Using %s %s, ignoring %s %s\n",
                         oldType, XkbcAtomText(using),
                         newType, XkbcAtomText(ignoring));
             }
@@ -262,7 +262,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
     new = NextIndicatorName(info);
     if (!new)
     {
-        WSGO1("Couldn't allocate name for indicator %d\n", new->ndx);
+        WSGO("Couldn't allocate name for indicator %d\n", new->ndx);
         ACTION("Ignored\n");
         return False;
     }
@@ -331,8 +331,8 @@ AddKeyName(KeyNamesInfo * info,
 
     if ((kc < info->effectiveMin) || (kc > info->effectiveMax))
     {
-        ERROR2("Illegal keycode %d for name <%s>\n", kc, name);
-        ACTION2("Must be in the range %d-%d inclusive\n",
+        ERROR("Illegal keycode %d for name <%s>\n", kc, name);
+        ACTION("Must be in the range %d-%d inclusive\n",
                 info->effectiveMin, info->effectiveMax);
         return False;
     }
@@ -364,7 +364,7 @@ AddKeyName(KeyNamesInfo * info,
             else if (reportCollisions)
             {
                 WARN("Multiple identical key name definitions\n");
-                ACTION2("Later occurences of \"<%s> = %d\" ignored\n",
+                ACTION("Later occurences of \"<%s> = %d\" ignored\n",
                         buf, kc);
             }
             return True;
@@ -373,8 +373,8 @@ AddKeyName(KeyNamesInfo * info,
         {
             if (reportCollisions)
             {
-                WARN1("Multiple names for keycode %d\n", kc);
-                ACTION2("Using <%s>, ignoring <%s>\n", buf, name);
+                WARN("Multiple names for keycode %d\n", kc);
+                ACTION("Using <%s>, ignoring <%s>\n", buf, name);
             }
             return True;
         }
@@ -382,8 +382,8 @@ AddKeyName(KeyNamesInfo * info,
         {
             if (reportCollisions)
             {
-                WARN1("Multiple names for keycode %d\n", kc);
-                ACTION2("Using <%s>, ignoring <%s>\n", name, buf);
+                WARN("Multiple names for keycode %d\n", kc);
+                ACTION("Using <%s>, ignoring <%s>\n", name, buf);
             }
             info->names[kc] = 0;
             info->files[kc] = 0;
@@ -399,16 +399,16 @@ AddKeyName(KeyNamesInfo * info,
             info->has_alt_forms[old] = True;
             if (reportCollisions)
             {
-                WARN1("Key name <%s> assigned to multiple keys\n", name);
-                ACTION2("Using %d, ignoring %d\n", kc, old);
+                WARN("Key name <%s> assigned to multiple keys\n", name);
+                ACTION("Using %d, ignoring %d\n", kc, old);
             }
         }
         else if (merge != MergeAltForm)
         {
             if ((reportCollisions) && (warningLevel > 3))
             {
-                WARN1("Key name <%s> assigned to multiple keys\n", name);
-                ACTION2("Using %d, ignoring %d\n", old, kc);
+                WARN("Key name <%s> assigned to multiple keys\n", name);
+                ACTION("Using %d, ignoring %d\n", old, kc);
                 ACTION
                     ("Use 'alternate' keyword to assign the same name to multiple keys\n");
             }
@@ -584,14 +584,14 @@ HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info)
 
     if (!ExprResolveInteger(stmt->value, &result, NULL, NULL))
     {
-        ACTION1("No value keycode assigned to name <%s>\n", stmt->name);
+        ACTION("No value keycode assigned to name <%s>\n", stmt->name);
         return 0;
     }
     code = result.ival;
     if ((code < info->effectiveMin) || (code > info->effectiveMax))
     {
-        ERROR2("Illegal keycode %d for name <%s>\n", code, stmt->name);
-        ACTION2("Must be in the range %d-%d inclusive\n",
+        ERROR("Illegal keycode %d for name <%s>\n", code, stmt->name);
+        ACTION("Must be in the range %d-%d inclusive\n",
                 info->effectiveMin, info->effectiveMax);
         return 0;
     }
@@ -626,8 +626,8 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
 
     if (tmp.str != NULL)
     {
-        ERROR1("Unknown element %s encountered\n", tmp.str);
-        ACTION1("Default for field %s ignored\n", field.str);
+        ERROR("Unknown element %s encountered\n", tmp.str);
+        ACTION("Default for field %s ignored\n", field.str);
         return 0;
     }
     if (uStrCaseCmp(field.str, "minimum") == 0)
@@ -637,34 +637,34 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
     else
     {
         ERROR("Unknown field encountered\n");
-        ACTION1("Assigment to field %s ignored\n", field.str);
+        ACTION("Assigment to field %s ignored\n", field.str);
         return 0;
     }
     if (arrayNdx != NULL)
     {
-        ERROR1("The %s setting is not an array\n", field.str);
+        ERROR("The %s setting is not an array\n", field.str);
         ACTION("Illegal array reference ignored\n");
         return 0;
     }
 
     if (ExprResolveInteger(stmt->value, &tmp, NULL, NULL) == 0)
     {
-        ACTION1("Assignment to field %s ignored\n", field.str);
+        ACTION("Assignment to field %s ignored\n", field.str);
         return 0;
     }
     if ((tmp.ival < XkbMinLegalKeyCode) || (tmp.ival > XkbMaxLegalKeyCode))
     {
-        ERROR3
+        ERROR
             ("Illegal keycode %d (must be in the range %d-%d inclusive)\n",
              tmp.ival, XkbMinLegalKeyCode, XkbMaxLegalKeyCode);
-        ACTION1("Value of \"%s\" not changed\n", field.str);
+        ACTION("Value of \"%s\" not changed\n", field.str);
         return 0;
     }
     if (which == MIN_KEYCODE_DEF)
     {
         if ((info->explicitMax > 0) && (info->explicitMax < tmp.ival))
         {
-            ERROR2
+            ERROR
                 ("Minimum key code (%d) must be <= maximum key code (%d)\n",
                  tmp.ival, info->explicitMax);
             ACTION("Minimum key code value not changed\n");
@@ -672,7 +672,7 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
         }
         if ((info->computedMax > 0) && (info->computedMin < tmp.ival))
         {
-            ERROR2
+            ERROR
                 ("Minimum key code (%d) must be <= lowest defined key (%d)\n",
                  tmp.ival, info->computedMin);
             ACTION("Minimum key code value not changed\n");
@@ -685,14 +685,14 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
     {
         if ((info->explicitMin > 0) && (info->explicitMin > tmp.ival))
         {
-            ERROR2("Maximum code (%d) must be >= minimum key code (%d)\n",
+            ERROR("Maximum code (%d) must be >= minimum key code (%d)\n",
                    tmp.ival, info->explicitMin);
             ACTION("Maximum code value not changed\n");
             return 0;
         }
         if ((info->computedMax > 0) && (info->computedMax > tmp.ival))
         {
-            ERROR2
+            ERROR
                 ("Maximum code (%d) must be >= highest defined key (%d)\n",
                  tmp.ival, info->computedMax);
             ACTION("Maximum code value not changed\n");
@@ -714,7 +714,7 @@ HandleIndicatorNameDef(IndicatorNameDef * def,
     if ((def->ndx < 1) || (def->ndx > XkbNumIndicators))
     {
         info->errorCount++;
-        ERROR1("Name specified for illegal indicator index %d\n", def->ndx);
+        ERROR("Name specified for illegal indicator index %d\n", def->ndx);
         ACTION("Ignored\n");
         return False;
     }
@@ -786,14 +786,14 @@ HandleKeycodesFile(XkbFile * file,
         case StmtInterpDef:
         case StmtVModDef:
             ERROR("Keycode files may define key and indicator names only\n");
-            ACTION1("Ignoring definition of %s\n",
+            ACTION("Ignoring definition of %s\n",
                     ((stmt->stmtType ==
                       StmtInterpDef) ? "a symbol interpretation" :
                      "virtual modifiers"));
             info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleKeycodesFile\n",
+            WSGO("Unexpected statement type %d in HandleKeycodesFile\n",
                   stmt->stmtType);
             break;
         }
@@ -803,7 +803,7 @@ HandleKeycodesFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning keycodes file \"%s\"\n", file->topName);
+            ACTION("Abandoning keycodes file \"%s\"\n", file->topName);
             break;
         }
     }