diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-01-21 13:08:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-01-21 14:11:37 +1000 |
| commit | 9510dedad875099c32993246188050ea73ab1a9f (patch) | |
| tree | 2471fbf77a8fef9e3e57ac4cb757472d6cb96016 /alias.c | |
| parent | ff6a19ed8898ee8c79b2b2a2f87806353d89f5d4 (diff) | |
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>
Diffstat (limited to 'alias.c')
| -rw-r--r-- | alias.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -39,7 +39,7 @@ HandleCollision(AliasInfo * old, AliasInfo * new) if (((new->def.fileID == old->def.fileID) && (warningLevel > 0)) || (warningLevel > 9)) { - WARN2("Alias of %s for %s declared more than once\n", + WARN("Alias of %s for %s declared more than once\n", XkbKeyNameText(new->alias, XkbMessage), XkbKeyNameText(new->real, XkbMessage)); ACTION("First definition ignored\n"); @@ -61,9 +61,9 @@ HandleCollision(AliasInfo * old, AliasInfo * new) if (((old->def.fileID == new->def.fileID) && (warningLevel > 0)) || (warningLevel > 9)) { - WARN1("Multiple definitions for alias %s\n", + WARN("Multiple definitions for alias %s\n", XkbKeyNameText(old->alias, XkbMessage)); - ACTION2("Using %s, ignoring %s\n", + ACTION("Using %s, ignoring %s\n", XkbKeyNameText(use, XkbMessage), XkbKeyNameText(ignore, XkbMessage)); } @@ -187,7 +187,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) { if (warningLevel > 4) { - WARN2("Attempt to alias %s to non-existent key %s\n", + WARN("Attempt to alias %s to non-existent key %s\n", XkbKeyNameText(info->alias, XkbMessage), XkbKeyNameText(info->real, XkbMessage)); ACTION("Ignored\n"); @@ -201,7 +201,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) if (warningLevel > 4) { WARN("Attempt to create alias with the name of a real key\n"); - ACTION2("Alias \"%s = %s\" ignored\n", + ACTION("Alias \"%s = %s\" ignored\n", XkbKeyNameText(info->alias, XkbMessage), XkbKeyNameText(info->real, XkbMessage)); } @@ -277,7 +277,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) #ifdef DEBUG if ((a - old) != (nOld + nNew)) { - WSGO2("Expected %d aliases total but created %d\n", nOld + nNew, + WSGO("Expected %d aliases total but created %d\n", nOld + nNew, (int)(a - old)); } #endif |