Remove pack file handling dependency from wrapper.o

As v1.7.0-rc0~43 (slim down "git show-index", 2010-01-21) explains,
use of xmalloc() brings in a dependency on zlib, the sha1 lib, and the
rest of git's object file access machinery via try_to_free_pack_memory.
That is overkill when xmalloc is just being used as a convenience
wrapper to exit when no memory is available.

So defer setting try_to_free_pack_memory as try_to_free_routine until
the first packfile is opened in add_packed_git().

After this change, a simple program using xmalloc() and no other
functions will not pull in any code from libgit.a aside from wrapper.o
and usage.o.

Improved-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_file.c b/sha1_file.c
index 8e299ae85cf614e17a9571d60e6ab2a92f081eb3..e0d2496bcd6ffbaccae9aebd935a908514ac78a5 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -818,11 +818,22 @@ static struct packed_git *alloc_packed_git(int extra)
        return p;
 }
 
        return p;
 }
 

+static void try_to_free_pack_memory(size_t size)
+{
+       release_pack_memory(size, -1);
+}
+

 struct packed_git *add_packed_git(const char *path, int path_len, int local)
 {
 struct packed_git *add_packed_git(const char *path, int path_len, int local)
 {

+       static int have_set_try_to_free_routine;

        struct stat st;
        struct packed_git *p = alloc_packed_git(path_len + 2);
 
        struct stat st;
        struct packed_git *p = alloc_packed_git(path_len + 2);
 

+       if (!have_set_try_to_free_routine) {
+               have_set_try_to_free_routine = 1;
+               set_try_to_free_routine(try_to_free_pack_memory);
+       }
+

        /*
         * Make sure a corresponding .pack file exists and that
         * the index looks sane.
        /*
         * Make sure a corresponding .pack file exists and that
         * the index looks sane.

diff --git a/wrapper.c b/wrapper.c
index 185dfbcc463fd57fd5051457ef5d90d28b487177..4c1639f1536d259a2b64d574005ac973d042b273 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -3,12 +3,11 @@
  */
 #include "cache.h"
 
  */
 #include "cache.h"
 

-static void try_to_free_builtin(size_t size)
+static void do_nothing(size_t size)

 {
 {

-       release_pack_memory(size, -1);

 }
 
 }
 

-static void (*try_to_free_routine)(size_t size) = try_to_free_builtin;
+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 set_try_to_free_routine(try_to_free_t routine)
 {