Skip to content

Commit 5595a5e

Browse files
jeffhostetlerdscho
authored andcommitted
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 5af4694 commit 5595a5e

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

compat/win32/fscache.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ static struct hashmap map;
1010
static CRITICAL_SECTION mutex;
1111
static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
1212

13-
int fscache_is_enabled(void)
14-
{
15-
return enabled;
16-
}
17-
1813
/*
1914
* An entry in the file system cache. Used for both entire directory listings
2015
* and file entries.
@@ -271,7 +266,7 @@ static void fscache_clear(void)
271266
/*
272267
* Checks if the cache is enabled for the given path.
273268
*/
274-
static inline int fscache_enabled(const char *path)
269+
int fscache_enabled(const char *path)
275270
{
276271
return enabled > 0 && !is_absolute_path(path);
277272
}

compat/win32/fscache.h

+2-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
10611061
size_t size = 0;
10621062
char *buf;
10631063

1064-
if (is_fscache_enabled()) {
1064+
if (is_fscache_enabled(fname)) {
10651065
if (lstat(fname, &st) < 0) {
10661066
fd = -1;
10671067
} else {

git-compat-util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,7 @@ static inline int is_missing_file_error(int errno_)
15531553
#endif
15541554

15551555
#ifndef is_fscache_enabled
1556-
#define is_fscache_enabled() (0)
1556+
#define is_fscache_enabled(path) (0)
15571557
#endif
15581558

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

0 commit comments

Comments
 (0)