Merge branch 'jh/trace2-pretty-output'

diff --git a/trace.c b/trace.c
index fa4a2e7120e405f3cf2d12422802b785f9e37fad..b3ef0e627f8cec18433c17ffb080575894882758 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -88,8 +88,6 @@ static int prepare_trace_line(const char *file, int line,
        if (!trace_want(key))
                return 0;
 
-       set_try_to_free_routine(NULL);  /* is never reset */
-
        /* unit tests may want to disable additional trace output */
        if (trace_want(&trace_bare))
                return 1;