summaryrefslogtreecommitdiff
path: root/utils.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-01-21 13:08:25 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-01-21 14:11:37 +1000
commit9510dedad875099c32993246188050ea73ab1a9f (patch)
tree2471fbf77a8fef9e3e57ac4cb757472d6cb96016 /utils.h
parentff6a19ed8898ee8c79b2b2a2f87806353d89f5d4 (diff)
downloadxorg-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 'utils.h')
-rw-r--r--utils.h36
1 files changed, 0 insertions, 36 deletions
diff --git a/utils.h b/utils.h
index 6df8256..728d7b4 100644
--- a/utils.h
+++ b/utils.h
@@ -107,69 +107,33 @@ extern void uFree(Opaque /* ptr */
extern Boolean uSetErrorFile(char * /* name */
);
-#define INFO6 uInformation
-#define INFO5 uInformation
-#define INFO4 uInformation
-#define INFO3 uInformation
-#define INFO2 uInformation
-#define INFO1 uInformation
#define INFO uInformation
extern void
uInformation(const char * /* s */ , ...
) _X_ATTRIBUTE_PRINTF(1, 2);
-#define ACTION6 uAction
-#define ACTION5 uAction
-#define ACTION4 uAction
-#define ACTION3 uAction
-#define ACTION2 uAction
-#define ACTION1 uAction
#define ACTION uAction
extern void uAction(const char * /* s */ , ...
) _X_ATTRIBUTE_PRINTF(1, 2);
-#define WARN6 uWarning
-#define WARN5 uWarning
-#define WARN4 uWarning
-#define WARN3 uWarning
-#define WARN2 uWarning
-#define WARN1 uWarning
#define WARN uWarning
extern void uWarning(const char * /* s */ , ...
) _X_ATTRIBUTE_PRINTF(1, 2);
-#define ERROR6 uError
-#define ERROR5 uError
-#define ERROR4 uError
-#define ERROR3 uError
-#define ERROR2 uError
-#define ERROR1 uError
#define ERROR uError
extern void uError(const char * /* s */ , ...
) _X_ATTRIBUTE_PRINTF(1, 2);
-#define FATAL6 uFatalError
-#define FATAL5 uFatalError
-#define FATAL4 uFatalError
-#define FATAL3 uFatalError
-#define FATAL2 uFatalError
-#define FATAL1 uFatalError
#define FATAL uFatalError
extern void uFatalError(const char * /* s */ , ...
) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
/* WSGO stands for "Weird Stuff Going On" */
-#define WSGO6 uInternalError
-#define WSGO5 uInternalError
-#define WSGO4 uInternalError
-#define WSGO3 uInternalError
-#define WSGO2 uInternalError
-#define WSGO1 uInternalError
#define WSGO uInternalError
extern void uInternalError(const char * /* s */ , ...