summaryrefslogtreecommitdiff
path: root/wrapper.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:21 (GMT)
commit44e08b003d37440fba6589c07a9573df9d28e6f5 (patch)
treef663e002f1183cf7330b5f34e16b44096ebeb72f /wrapper.c
parent57af58e888165db623925f25e290f1b9472fd5c9 (diff)
parent3a0942598ce33b195bfaaf250b2da23e4eceb3c6 (diff)
downloadgit-44e08b003d37440fba6589c07a9573df9d28e6f5.zip
git-44e08b003d37440fba6589c07a9573df9d28e6f5.tar.gz
git-44e08b003d37440fba6589c07a9573df9d28e6f5.tar.bz2
Merge branch 'js/try-to-free-stackable'
* js/try-to-free-stackable: Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used Have set_try_to_free_routine return the previous routine
Diffstat (limited to 'wrapper.c')
-rw-r--r--wrapper.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/wrapper.c b/wrapper.c
index 58201b6..afb4f6f 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -10,9 +10,11 @@ static void try_to_free_builtin(size_t size)
static void (*try_to_free_routine)(size_t size) = try_to_free_builtin;
-void set_try_to_free_routine(void (*routine)(size_t))
+try_to_free_t set_try_to_free_routine(try_to_free_t routine)
{
- try_to_free_routine = (routine) ? routine : try_to_free_builtin;
+ try_to_free_t old = try_to_free_routine;
+ try_to_free_routine = routine;
+ return old;
}
char *xstrdup(const char *str)