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 /parseutils.c | |
| parent | ff6a19ed8898ee8c79b2b2a2f87806353d89f5d4 (diff) | |
| download | xorg-app-xkbcomp-9510dedad875099c32993246188050ea73ab1a9f.tar.gz | |
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 'parseutils.c')
| -rw-r--r-- | parseutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parseutils.c b/parseutils.c index b3b4e9f..4b77c4c 100644 --- a/parseutils.c +++ b/parseutils.c @@ -719,7 +719,7 @@ IncludeCreate(char *str, unsigned merge) uFree(stmt); return first; BAIL: - ERROR1("Illegal include statement \"%s\"\n", stmt); + ERROR("Illegal include statement \"%s\"\n", stmt); ACTION("Ignored\n"); while (first) { @@ -776,9 +776,9 @@ CheckDefaultMap(XkbFile * maps) { if (warningLevel > 2) { - WARN1("Multiple default components in %s\n", + WARN("Multiple default components in %s\n", (scanFile ? scanFile : "(unknown)")); - ACTION2("Using %s, ignoring %s\n", + ACTION("Using %s, ignoring %s\n", (dflt->name ? dflt->name : "(first)"), (tmp->name ? tmp->name : "(subsequent)")); } |