1 files changed, 13 insertions, 9 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);