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

gitster · gitster · commit c9831bb09d09 · 2014-07-16T11:32:33.000-07:00
* kb/path-max-must-go:
  cache.h: rename cache_def_free to cache_def_clear
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,7 @@ struct cache_def {`
`1115`	`1115`	`int prefix_len_stat_func;`
`1116`	`1116`	`};`
`1117`	`1117`	`#define CACHE_DEF_INIT { STRBUF_INIT, 0, 0, 0 }`
`1118`		`-static inline void cache_def_free(struct cache_def *cache)`
	`1118`	`+static inline void cache_def_clear(struct cache_def *cache)`
`1119`	`1119`	`{`
`1120`	`1120`	`strbuf_release(&cache->path);`
`1121`	`1121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static void preload_thread(void _data)`
`63`	`63`	`continue;`
`64`	`64`	`ce_mark_uptodate(ce);`
`65`	`65`	`} while (--nr > 0);`
`66`		`- cache_def_free(&cache);`
	`66`	`+ cache_def_clear(&cache);`
`67`	`67`	`return NULL;`
`68`	`68`	`}`
`69`	`69`