From a5336d82eaee1ea72053a7d24c841f631fc48892 Mon Sep 17 00:00:00 2001 From: Gediminas Jakutis Date: Tue, 9 Feb 2021 05:12:49 +0200 Subject: diagnostic: now with line numbers and filenames! Signed-off-by: Gediminas Jakutis --- include/rin/diagnostic.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/rin') diff --git a/include/rin/diagnostic.h b/include/rin/diagnostic.h index cd33da7..7941c8a 100644 --- a/include/rin/diagnostic.h +++ b/include/rin/diagnostic.h @@ -35,14 +35,14 @@ void rin_diag_init(void); int rin_diag_format(const enum rin_diag_outstream, const char * const format); int rin_diag_set_outstream(const enum rin_diag_outstream channel, FILE * const stream); -void __rin_err(const char * const func_name, const char *format, ...) FORMAT_STRING(2, 3); -void __rin_warn(const char * const func_name, const char *format, ...) FORMAT_STRING(2, 3); -void __rin_fixme(const char * const func_name, const char *format, ...) FORMAT_STRING(2, 3); -void __rin_info(const char * const func_name, const char *format, ...) FORMAT_STRING(2, 3); +void __rin_err(const char * const func_name, int line_num, const char * const file_name, const char *format, ...) FORMAT_STRING(4, 5); +void __rin_warn(const char * const func_name, int line_num, const char * const file_name, const char *format, ...) FORMAT_STRING(4, 5); +void __rin_fixme(const char * const func_name, int line_num, const char * const file_name, const char *format, ...) FORMAT_STRING(4, 5); +void __rin_info(const char * const func_name, int line_num, const char * const file_name, const char *format, ...) FORMAT_STRING(4, 5); -#define rin_err(a,...) do {__rin_err(__func__, a __VA_OPT__(,) __VA_ARGS__); } while (0) -#define rin_warn(a,...) do {__rin_warn(__func__, a __VA_OPT__(,) __VA_ARGS__); } while (0) -#define rin_fixme(a,...) do {__rin_fixme(__func__, a __VA_OPT__(,) __VA_ARGS__); } while (0) -#define rin_info(a,...) do {__rin_info(__func__, a __VA_OPT__(,) __VA_ARGS__); } while (0) +#define rin_err(a,...) do {__rin_err(__func__, __LINE__, __FILE__, a __VA_OPT__(,) __VA_ARGS__); } while (0) +#define rin_warn(a,...) do {__rin_warn(__func__, __LINE__, __FILE__, a __VA_OPT__(,) __VA_ARGS__); } while (0) +#define rin_fixme(a,...) do {__rin_fixme(__func__, __LINE__, __FILE__, a __VA_OPT__(,) __VA_ARGS__); } while (0) +#define rin_info(a,...) do {__rin_info(__func__, __LINE__, __FILE__, a __VA_OPT__(,) __VA_ARGS__); } while (0) #endif /* LIBRIN_DIAGNOSTIC_INCLUDED */ -- cgit v1.2.3