summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 11:32:33 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-16 11:32:33 -0700
commitc9831bb09d090011a51d2645ab638cf956924513 (patch)
tree13e76cefde992120024bc06d1f18e00986e8169d
parent6a5713b576c3e54388d58984b759e1215d425bcf (diff)
parent2a608391509dc5ea50c9b88e5b98dae6694d7011 (diff)
downloadgit-c9831bb09d090011a51d2645ab638cf956924513.tar.gz
Merge branch 'kb/path-max-must-go'
* kb/path-max-must-go: cache.h: rename cache_def_free to cache_def_clear
-rw-r--r--cache.h2
-rw-r--r--preload-index.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 6db3ae1b43..92fc9f1121 100644
--- 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 79ce8a998b..c1fe3a3ef9 100644
--- 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;
}