Merge branch 'kb/path-max-must-go'

* kb/path-max-must-go:
cache.h: rename cache_def_free to cache_def_clear

diff --git a/cache.h b/cache.h
index 6db3ae1b4343181b86e653e252d65a9435a4b654..92fc9f1121776fbebf180b5e9d958982e8a98014 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1115,7 +1115,7 @@ struct cache_def {
        int prefix_len_stat_func;
 };
 #define CACHE_DEF_INIT { STRBUF_INIT, 0, 0, 0 }
-static inline void cache_def_free(struct cache_def *cache)
+static inline void cache_def_clear(struct cache_def *cache)
 {
        strbuf_release(&cache->path);
 }

diff --git a/preload-index.c b/preload-index.c
index 79ce8a998b0008f9182fa127b85d63feff4592d0..c1fe3a3ef9cba0c155d02475e24315784bd27ae4 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -63,7 +63,7 @@ static void *preload_thread(void *_data)
                        continue;
                ce_mark_uptodate(ce);
        } while (--nr > 0);
-       cache_def_free(&cache);
+       cache_def_clear(&cache);
        return NULL;
 }