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

* kb/path-max-must-go: cache.h: rename cache_def_free to cache_def_clear
git-mirror · Jul 16, 2014 · c9831bb · c9831bb
2 parents 6a5713b + 2a60839
commit c9831bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }