Skip to content

Commit 256e915

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 67cb864 commit 256e915

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
@@ -9,11 +9,6 @@ static struct hashmap map;
99
static CRITICAL_SECTION mutex;
1010
static struct trace_key trace_fscache = TRACE_KEY_INIT(FSCACHE);
1111

12-
int fscache_is_enabled(void)
13-
{
14-
return enabled;
15-
}
16-
1712
/*
1813
* An entry in the file system cache. Used for both entire directory listings
1914
* and file entries.
@@ -270,7 +265,7 @@ static void fscache_clear(void)
270265
/*
271266
* Checks if the cache is enabled for the given path.
272267
*/
273-
static inline int fscache_enabled(const char *path)
268+
int fscache_enabled(const char *path)
274269
{
275270
return enabled > 0 && !is_absolute_path(path);
276271
}

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
@@ -1063,7 +1063,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
10631063
size_t size = 0;
10641064
char *buf;
10651065

1066-
if (is_fscache_enabled()) {
1066+
if (is_fscache_enabled(fname)) {
10671067
if (lstat(fname, &st) < 0) {
10681068
fd = -1;
10691069
} else {

git-compat-util.h

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

13971397
#ifndef is_fscache_enabled
1398-
#define is_fscache_enabled() (0)
1398+
#define is_fscache_enabled(path) (0)
13991399
#endif
14001400

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

0 commit comments

Comments
 (0)