Skip to content

Commit 78766cc

Browse files
jeffhostetlerGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
fscache: make fscache_enabled() public
Make fscache_enabled() function public rather than static. Remove unneeded fscache_is_enabled() function. Change is_fscache_enabled() macro to call fscache_enabled(). is_fscache_enabled() now takes a pathname so that the answer is more precise and mean "is fscache enabled for this pathname", since fscache only stores repo-relative paths and not absolute paths, we can avoid attempting lookups for absolute paths. Signed-off-by: Jeff Hostetler <[email protected]>
1 parent c971134 commit 78766cc

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

compat/win32/fscache.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ static struct hashmap map;
1212
static CRITICAL_SECTION mutex;
1313
static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
1414

15-
int fscache_is_enabled(void)
16-
{
17-
return enabled;
18-
}
19-
2015
/*
2116
* An entry in the file system cache. Used for both entire directory listings
2217
* and file entries.
@@ -278,7 +273,7 @@ static void fscache_clear(void)
278273
/*
279274
* Checks if the cache is enabled for the given path.
280275
*/
281-
static inline int fscache_enabled(const char *path)
276+
int fscache_enabled(const char *path)
282277
{
283278
return enabled > 0 && !is_absolute_path(path);
284279
}

compat/win32/fscache.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
int fscache_enable(int enable);
55
#define enable_fscache(x) fscache_enable(x)
66

7-
int fscache_is_enabled(void);
8-
#define is_fscache_enabled() (fscache_is_enabled())
7+
int fscache_enabled(const char *path);
8+
#define is_fscache_enabled(path) fscache_enabled(path)
99

1010
DIR *fscache_opendir(const char *dir);
1111
int fscache_lstat(const char *file_name, struct stat *buf);

dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
11141114
size_t size = 0;
11151115
char *buf;
11161116

1117-
if (is_fscache_enabled()) {
1117+
if (is_fscache_enabled(fname)) {
11181118
if (lstat(fname, &st) < 0) {
11191119
fd = -1;
11201120
} else {

git-compat-util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ static inline int is_missing_file_error(int errno_)
10801080
#endif
10811081

10821082
#ifndef is_fscache_enabled
1083-
#define is_fscache_enabled() (0)
1083+
#define is_fscache_enabled(path) (0)
10841084
#endif
10851085

10861086
int cmd_main(int, const char **);

0 commit comments

Comments
 (0)