Commit 5d728c84 authored by Brad Roberts's avatar Brad Roberts Committed by Petr Baudis

Rename cache_match_stat() to ce_match_stat()

Signed-off-by: Brad Roberts's avatarBrad Roberts <[email protected]>
Signed-off-by: Petr Baudis's avatarPetr Baudis <[email protected]>
parent 127cfd0d
......@@ -129,7 +129,7 @@ extern int add_cache_entry(struct cache_entry *ce, int option);
extern int remove_entry_at(int pos);
extern int remove_file_from_cache(char *path);
extern int same_name(struct cache_entry *a, struct cache_entry *b);
extern int cache_match_stat(struct cache_entry *ce, struct stat *st);
extern int ce_match_stat(struct cache_entry *ce, struct stat *st);
extern int index_fd(unsigned char *sha1, int fd, struct stat *st);
#define MTIME_CHANGED 0x0001
......
......@@ -31,7 +31,7 @@ static void check_file(const char *path)
if (lstat(path, &st) < 0)
die("lstat(%s): %s", path, strerror(errno));
changed = cache_match_stat(ce, &st);
changed = ce_match_stat(ce, &st);
if (changed)
die("preparing to update file '%s' not uptodate in cache", path);
}
......
......@@ -167,7 +167,7 @@ static int checkout_entry(struct cache_entry *ce, const char *base_dir)
strcpy(path + len, ce->name);
if (!lstat(path, &st)) {
unsigned changed = cache_match_stat(ce, &st);
unsigned changed = ce_match_stat(ce, &st);
if (!changed)
return 0;
if (!force) {
......
......@@ -33,7 +33,7 @@ static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned
}
return -1;
}
changed = cache_match_stat(ce, &st);
changed = ce_match_stat(ce, &st);
if (changed) {
mode = create_ce_mode(st.st_mode);
sha1 = no_sha1;
......
......@@ -121,7 +121,7 @@ int main(int argc, char **argv)
show_file('-', ce);
continue;
}
changed = cache_match_stat(ce, &st);
changed = ce_match_stat(ce, &st);
if (!changed)
continue;
......
......@@ -175,7 +175,7 @@ static int work_tree_matches(const char *name, const unsigned char *sha1)
ce = active_cache[pos];
if ((lstat(name, &st) < 0) ||
!S_ISREG(st.st_mode) ||
cache_match_stat(ce, &st) ||
ce_match_stat(ce, &st) ||
memcmp(sha1, ce->sha1, 20))
return 0;
return 1;
......
......@@ -9,7 +9,7 @@
struct cache_entry **active_cache = NULL;
unsigned int active_nr = 0, active_alloc = 0, active_cache_changed = 0;
int cache_match_stat(struct cache_entry *ce, struct stat *st)
int ce_match_stat(struct cache_entry *ce, struct stat *st)
{
unsigned int changed = 0;
......
......@@ -191,7 +191,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
if (lstat(ce->name, &st) < 0)
return ERR_PTR(-errno);
changed = cache_match_stat(ce, &st);
changed = ce_match_stat(ce, &st);
if (!changed)
return ce;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment