Skip to content

Commit 3cf373d

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 2303171 commit 3cf373d

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
@@ -8,11 +8,6 @@ static volatile long enabled;
88
static struct hashmap map;
99
static CRITICAL_SECTION mutex;
1010

11-
int fscache_is_enabled(void)
12-
{
13-
return enabled;
14-
}
15-
1611
/*
1712
* An entry in the file system cache. Used for both entire directory listings
1813
* and file entries.
@@ -247,7 +242,7 @@ static void fscache_clear(void)
247242
/*
248243
* Checks if the cache is enabled for the given path.
249244
*/
250-
static inline int fscache_enabled(const char *path)
245+
int fscache_enabled(const char *path)
251246
{
252247
return enabled > 0 && !is_absolute_path(path);
253248
}

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
@@ -786,7 +786,7 @@ static int add_excludes(const char *fname, const char *base, int baselen,
786786
size_t size = 0;
787787
char *buf;
788788

789-
if (is_fscache_enabled()) {
789+
if (is_fscache_enabled(fname)) {
790790
if (lstat(fname, &st) < 0) {
791791
fd = -1;
792792
} else {

git-compat-util.h

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

12911291
#ifndef is_fscache_enabled
1292-
#define is_fscache_enabled() (0)
1292+
#define is_fscache_enabled(path) (0)
12931293
#endif
12941294

12951295
extern int cmd_main(int, const char **);

0 commit comments

Comments
 (0)