set_try_to_free_routine(NULL) means "do nothing special"

gitster · gitster · commit 00b0d7f77b65 · 2010-12-21T09:25:14.000-08:00
This way, the next caller that wants to disable our memory reclamation
machinery does not have to define its own do_nothing() stub.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/trace.c b/trace.c
@@ -25,10 +25,6 @@
 #include "cache.h"
 #include "quote.h"
 
-static void do_nothing(size_t unused)
-{
-}
-
 /* Get a trace file descriptor from GIT_TRACE env variable. */
 static int get_trace_fd(int *need_close)
 {
@@ -76,7 +72,7 @@ void trace_printf(const char *fmt, ...)
 	if (!fd)
 		return;
 
-	set_try_to_free_routine(do_nothing);	/* is never reset */
+	set_try_to_free_routine(NULL);	/* is never reset */
 	strbuf_init(&buf, 64);
 	va_start(ap, fmt);
 	len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
@@ -108,7 +104,7 @@ void trace_argv_printf(const char **argv, const char *fmt, ...)
 	if (!fd)
 		return;
 
-	set_try_to_free_routine(do_nothing);	/* is never reset */
+	set_try_to_free_routine(NULL);	/* is never reset */
 	strbuf_init(&buf, 64);
 	va_start(ap, fmt);
 	len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
diff --git a/wrapper.c b/wrapper.c
@@ -12,6 +12,8 @@ static void (*try_to_free_routine)(size_t size) = do_nothing;
 try_to_free_t set_try_to_free_routine(try_to_free_t routine)
 {
 	try_to_free_t old = try_to_free_routine;
+	if (!routine)
+		routine = do_nothing;
 	try_to_free_routine = routine;
 	return old;
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ static void (*try_to_free_routine)(size_t size) = do_nothing;`
`12`	`12`	`try_to_free_t set_try_to_free_routine(try_to_free_t routine)`
`13`	`13`	`{`
`14`	`14`	`try_to_free_t old = try_to_free_routine;`
	`15`	`+ if (!routine)`
	`16`	`+ routine = do_nothing;`
`15`	`17`	`try_to_free_routine = routine;`
`16`	`18`	`return old;`
`17`	`19`	`}`