diff options
| author |  Gediminas Jakutis <gediminas@varciai.lt>
| 2019-10-24 17:06:52 +0300 |
|---|---|---|
| committer | Gediminas Jakutis <gediminas@varciai.lt>
| 2019-10-24 17:06:52 +0300 |
| commit | ae76e4106345035503466bf9dcfa3b0033a526c6 (patch) | |
| tree | 50ebddc83138785ec775aeb8e1c7ac06c7395706 /src/diagnostic | |
| parent | 84cec7dc2c645e4d1bbab8e8496c4f6cd9562989 (diff) | |
| download | librin-ae76e4106345035503466bf9dcfa3b0033a526c6.tar.gz librin-ae76e4106345035503466bf9dcfa3b0033a526c6.tar.bz2 librin-ae76e4106345035503466bf9dcfa3b0033a526c6.zip | |
diagnostic: implement printing function's name.
Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
Diffstat (limited to 'src/diagnostic')
| -rw-r--r-- | src/diagnostic/diagnostic.c | 22 | ||||
| -rw-r--r-- | src/diagnostic/diagnostic_private.h | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/diagnostic/diagnostic.c b/src/diagnostic/diagnostic.c index 4c4a993..1258711 100644 --- a/src/diagnostic/diagnostic.c +++ b/src/diagnostic/diagnostic.c @@ -81,39 +81,39 @@ int rin_diag_set_outstream(enum rin_diag_outstream channel, FILE *stream) return 0; } -void rin_err(const char *format, ...) +void __rin_err(const char *func_name, const char *format, ...) { va_list args; va_start(args, format); - __rin_msg(state.err ? state.err : stderr, "error", format, args); + __rin_msg(state.err ? state.err : stderr, "error", func_name, format, args); } -void rin_warn(const char *format, ...) +void __rin_warn(const char *func_name, const char *format, ...) { va_list args; va_start(args, format); - __rin_msg(state.warn ? state.warn : stderr, "warning", format, args); + __rin_msg(state.warn ? state.warn : stderr, "warning", func_name, format, args); } -void rin_fixme(const char *format, ...) +void __rin_fixme(const char *func_name, const char *format, ...) { va_list args; va_start(args, format); - __rin_msg(state.fixme ? state.fixme : stderr, "fixme", format, args); + __rin_msg(state.fixme ? state.fixme : stderr, "fixme", func_name, format, args); } -void rin_info(const char *format, ...) +void __rin_info(const char *func_name, const char *format, ...) { va_list args; va_start(args, format); - __rin_msg(state.info ? state.info : stdout, "info", format, args); + __rin_msg(state.info ? state.info : stdout, "info", func_name, format, args); } -static void __rin_msg(FILE *stream, const char *prefix, const char *format, va_list args) +static void __rin_msg(FILE *stream, const char *prefix, const char *func_name, const char *format, va_list args) { if (state.flags & RIN_DIAG_PREFIX) { fprintf(stream, "%s:", prefix); @@ -123,6 +123,10 @@ static void __rin_msg(FILE *stream, const char *prefix, const char *format, va_l fprintf(stream, state.pidconv, gettid()); } + if (state.flags & RIN_DIAG_FUNC) { + fprintf(stream, "%s:", func_name); + } + if (state.flags & RIN_DIAG_TIME) { struct timespec t; clock_gettime(RIN_CLOCK_WALL_COUNTER, &t); diff --git a/src/diagnostic/diagnostic_private.h b/src/diagnostic/diagnostic_private.h index 981bbe9..4f0033f 100644 --- a/src/diagnostic/diagnostic_private.h +++ b/src/diagnostic/diagnostic_private.h @@ -28,6 +28,6 @@ #define RIN_NEED_GETTID #include "rin/compat.h" -static void __rin_msg(FILE *stream, const char *prefix, const char *format, va_list args); +static void __rin_msg(FILE *stream, const char *prefix, const char *func_name, const char *format, va_list args); #endif /* LIBRIN_DIAGNOSTIC_PRIVATE_INCLUDED */ |