[PATCH 4/4] Trivial test harness fixes.

diff --git a/update-cache.c b/update-cache.c
index d7caed64f3384bac8f7a95992ce02c39190db4af..a6f9d6c178be67db9c681f536c650791479e6ef4 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -131,7 +131,7 @@ static int compare_data(struct cache_entry *ce, unsigned long expected_size)
        if (fd >= 0) {
                void *buffer;
                unsigned long size;
-               char type[10];
+               char type[20];
 
                buffer = read_sha1_file(ce->sha1, type, &size);
                if (buffer) {
@@ -191,7 +191,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
        if (lstat(ce->name, &st) < 0)
                return ERR_PTR(-errno);
 
-       changed = cache_match_stat(ce, &st);
+       changed = ce_match_stat(ce, &st);
        if (!changed)
                return ce;
 
@@ -249,6 +249,9 @@ static int refresh_cache(void)
                        continue;
                }
                active_cache_changed = 1;
+               /* You can NOT just free active_cache[i] here, since it
+                * might not be necessarily malloc()ed but can also come
+                * from mmap(). */
                active_cache[i] = new;
        }
        return has_errors;