From 9510dedad875099c32993246188050ea73ab1a9f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 21 Jan 2021 13:08:25 +1000
Subject: 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>
---
 indicators.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indicators.c')

diff --git a/indicators.c b/indicators.c
index 4ac437e..0beb2d6 100644
--- a/indicators.c
+++ b/indicators.c
@@ -83,7 +83,7 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new)
                 if (((old->defs.fileID == new->defs.fileID)
                      && (warningLevel > 0)) || (warningLevel > 9))
                 {
-                    WARN1("Map for indicator %s redefined\n",
+                    WARN("Map for indicator %s redefined\n",
                           XkbAtomText(NULL, old->name, XkbMessage));
                     ACTION("Earlier definition ignored\n");
                 }
@@ -135,9 +135,9 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new)
             }
             if (collide)
             {
-                WARN1("Map for indicator %s redefined\n",
+                WARN("Map for indicator %s redefined\n",
                       XkbAtomText(NULL, old->name, XkbMessage));
-                ACTION1("Using %s definition for duplicate fields\n",
+                ACTION("Using %s definition for duplicate fields\n",
                         (new->defs.merge == MergeAugment ? "first" : "last"));
             }
             return oldLEDs;
@@ -150,7 +150,7 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new)
     if (!old)
     {
         WSGO("Couldn't allocate indicator map\n");
-        ACTION1("Map for indicator %s not compiled\n",
+        ACTION("Map for indicator %s not compiled\n",
                 XkbAtomText(NULL, new->name, XkbMessage));
         return NULL;
     }
@@ -303,9 +303,9 @@ SetIndicatorMapField(LEDInfo * led,
                                           "indicator index");
         if ((rtrn.uval < 1) || (rtrn.uval > 32))
         {
-            ERROR2("Illegal indicator index %d (range 1..%d)\n",
+            ERROR("Illegal indicator index %d (range 1..%d)\n",
                    rtrn.uval, XkbNumIndicators);
-            ACTION1("Index definition for %s indicator ignored\n",
+            ACTION("Index definition for %s indicator ignored\n",
                     XkbAtomText(NULL, led->name, XkbMessage));
             return False;
         }
@@ -314,7 +314,7 @@ SetIndicatorMapField(LEDInfo * led,
     }
     else
     {
-        ERROR2("Unknown field %s in map for %s indicator\n", field,
+        ERROR("Unknown field %s in map for %s indicator\n", field,
                XkbAtomText(NULL, led->name, XkbMessage));
         ACTION("Definition ignored\n");
         ok = False;
@@ -350,10 +350,10 @@ HandleIndicatorMapDef(IndicatorMapDef * def,
         }
         if (elem.str != NULL)
         {
-            ERROR1
+            ERROR
                 ("Cannot set defaults for \"%s\" element in indicator map\n",
                  elem.str);
-            ACTION2("Assignment to %s.%s ignored\n", elem.str, field.str);
+            ACTION("Assignment to %s.%s ignored\n", elem.str, field.str);
             ok = False;
         }
         else
@@ -484,7 +484,7 @@ BindIndicators(XkbFileInfo * result,
                     if (led->indicator == _LED_NotBound)
                     {
                         ERROR("No unnamed indicators found\n");
-                        ACTION1
+                        ACTION
                             ("Virtual indicator map \"%s\" not bound\n",
                              XkbAtomGetString(xkb->dpy, led->name));
                         continue;
@@ -518,9 +518,9 @@ BindIndicators(XkbFileInfo * result,
                 (xkb->names->indicators[led->indicator - 1] != led->name))
             {
                 Atom old = xkb->names->indicators[led->indicator - 1];
-                ERROR1("Multiple names bound to indicator %d\n",
+                ERROR("Multiple names bound to indicator %d\n",
                        (unsigned int) led->indicator);
-                ACTION2("Using %s, ignoring %s\n",
+                ACTION("Using %s, ignoring %s\n",
                         XkbAtomGetString(xkb->dpy, old),
                         XkbAtomGetString(xkb->dpy, led->name));
                 led->indicator = _LED_NotBound;
-- 
cgit v1.2.3