diff options
| -rw-r--r-- | source4/include/debug.h | 4 | ||||
| -rw-r--r-- | source4/lib/debug.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/include/debug.h b/source4/include/debug.h index eaf53bad6a..d92232c645 100644 --- a/source4/include/debug.h +++ b/source4/include/debug.h @@ -35,7 +35,7 @@ struct debug_ops { void (*log_task_id)(int fd); }; -void do_debug_header(int level); +void do_debug_header(int level, const char *location, const char *func); void do_debug(const char *, ...) PRINTF_ATTRIBUTE(1,2); extern int DEBUGLEVEL; @@ -44,7 +44,7 @@ extern int DEBUGLEVEL; #define _DEBUG(level, body, header) do { \ if (DEBUGLVL(level)) { \ if (header) { \ - do_debug_header(level); \ + do_debug_header(level, __location__, __FUNCTION__); \ } \ do_debug body; \ } \ diff --git a/source4/lib/debug.c b/source4/lib/debug.c index d0288f7ddc..9df6e573b0 100644 --- a/source4/lib/debug.c +++ b/source4/lib/debug.c @@ -45,9 +45,9 @@ static struct { the backend for debug messages. Note that the DEBUG() macro has already ensured that the log level has been met before this is called */ -void do_debug_header(int level) +void do_debug_header(int level, const char *location, const char *func) { - log_timestring(level); + log_timestring(level, location, func); log_task_id(); } @@ -162,7 +162,7 @@ void print_suspicious_usage(const char* from, const char* info) } } -void log_timestring(int level) +void log_timestring(int level, const char *location, const char *func) { char *t = NULL; char *s = NULL; @@ -172,7 +172,7 @@ void log_timestring(int level) t = timestring(NULL, time(NULL)); if (!t) return; - asprintf(&s, "[%s, %d]\n", t, level); + asprintf(&s, "[%s, %d %s:%s()]\n", t, level, location, func); talloc_free(t); if (!s) return; |