From 9510dedad875099c32993246188050ea73ab1a9f Mon Sep 17 00:00:00 2001 From: Peter Hutterer 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 --- vmod.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vmod.c') diff --git a/vmod.c b/vmod.c index 8f3a665..8478386 100644 --- a/vmod.c +++ b/vmod.c @@ -107,21 +107,21 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info) if (!ExprResolveModMask(stmt->value, &mod, NULL, NULL)) { str1 = XkbAtomText(NULL, stmt->name, XkbMessage); - ACTION1("Declaration of %s ignored\n", str1); + ACTION("Declaration of %s ignored\n", str1); return False; } if (mod.uval == srv->vmods[i]) return True; str1 = XkbAtomText(NULL, stmt->name, XkbMessage); - WARN1("Virtual modifier %s multiply defined\n", str1); + WARN("Virtual modifier %s multiply defined\n", str1); str1 = XkbModMaskText(srv->vmods[i], XkbCFile); if (mergeMode == MergeOverride) { str2 = str1; str1 = XkbModMaskText(mod.uval, XkbCFile); } - ACTION2("Using %s, ignoring %s\n", str1, str2); + ACTION("Using %s, ignoring %s\n", str1, str2); if (mergeMode == MergeOverride) srv->vmods[i] = mod.uval; return True; @@ -133,7 +133,7 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info) } if (nextFree < 0) { - ERROR1("Too many virtual modifiers defined (maximum %d)\n", + ERROR("Too many virtual modifiers defined (maximum %d)\n", XkbNumVirtualMods); ACTION("Exiting\n"); return False; @@ -149,7 +149,7 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info) srv->vmods[nextFree] = mod.uval; return True; } - ACTION1("Declaration of %s ignored\n", + ACTION("Declaration of %s ignored\n", XkbAtomText(NULL, stmt->name, XkbMessage)); return False; } @@ -264,7 +264,7 @@ ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info) { if (val_rtrn->uval < XkbNumVirtualMods) return True; - ERROR2("Illegal virtual modifier %d (must be 0..%d inclusive)\n", + ERROR("Illegal virtual modifier %d (must be 0..%d inclusive)\n", val_rtrn->uval, XkbNumVirtualMods - 1); } return False; -- cgit v1.2.3