summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Roberts <braddr@puremagic.com>2005-05-15 02:04:25 (GMT)
committerPetr Baudis <xpasky@machine.sinus.cz>2005-05-15 10:26:25 (GMT)
commit5d728c8411a092f80171f787b5409d98978690c7 (patch)
tree0e04912f5efbc654765ce9b7fba5d824ab74b6b9
parent127cfd0d2f1db6ef690e01aafd1c660ea1c82499 (diff)
downloadgit-5d728c8411a092f80171f787b5409d98978690c7.zip
git-5d728c8411a092f80171f787b5409d98978690c7.tar.gz
git-5d728c8411a092f80171f787b5409d98978690c7.tar.bz2
Rename cache_match_stat() to ce_match_stat()
Signed-off-by: Brad Roberts <braddr@puremagic.com> Signed-off-by: Petr Baudis <pasky@ucw.cz>
-rw-r--r--cache.h2
-rw-r--r--check-files.c2
-rw-r--r--checkout-cache.c2
-rw-r--r--diff-cache.c2
-rw-r--r--diff-files.c2
-rw-r--r--diff.c2
-rw-r--r--read-cache.c2
-rw-r--r--update-cache.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/cache.h b/cache.h
index 7696766..3eb97e7 100644
--- a/cache.h
+++ b/cache.h
@@ -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
diff --git a/check-files.c b/check-files.c
index bfd5590..6fd69e7 100644
--- a/check-files.c
+++ b/check-files.c
@@ -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);
}
diff --git a/checkout-cache.c b/checkout-cache.c
index 1872937..462aea5 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -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) {
diff --git a/diff-cache.c b/diff-cache.c
index 8452719..afce955 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -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;
diff --git a/diff-files.c b/diff-files.c
index 28f1b13..54dd8bf 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -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;
diff --git a/diff.c b/diff.c
index 26b53cc..a237311 100644
--- a/diff.c
+++ b/diff.c
@@ -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;
diff --git a/read-cache.c b/read-cache.c
index da2adf4..ab2f202 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -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;
diff --git a/update-cache.c b/update-cache.c
index 19d8f82..a6f9d6c 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -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;