summaryrefslogtreecommitdiff
path: root/show-diff.c
diff options
context:
space:
mode:
Diffstat (limited to 'show-diff.c')
-rw-r--r--show-diff.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/show-diff.c b/show-diff.c
index 3c6d4f98b4..d9af29fd87 100644
--- a/show-diff.c
+++ b/show-diff.c
@@ -5,36 +5,6 @@
*/
#include "cache.h"
-#define MTIME_CHANGED 0x0001
-#define CTIME_CHANGED 0x0002
-#define OWNER_CHANGED 0x0004
-#define MODE_CHANGED 0x0008
-#define INODE_CHANGED 0x0010
-#define DATA_CHANGED 0x0020
-
-static int match_stat(struct cache_entry *ce, struct stat *st)
-{
- unsigned int changed = 0;
-
- if (ce->mtime.sec != (unsigned int)st->st_mtim.tv_sec ||
- ce->mtime.nsec != (unsigned int)st->st_mtim.tv_nsec)
- changed |= MTIME_CHANGED;
- if (ce->ctime.sec != (unsigned int)st->st_ctim.tv_sec ||
- ce->ctime.nsec != (unsigned int)st->st_ctim.tv_nsec)
- changed |= CTIME_CHANGED;
- if (ce->st_uid != (unsigned int)st->st_uid ||
- ce->st_gid != (unsigned int)st->st_gid)
- changed |= OWNER_CHANGED;
- if (ce->st_mode != (unsigned int)st->st_mode)
- changed |= MODE_CHANGED;
- if (ce->st_dev != (unsigned int)st->st_dev ||
- ce->st_ino != (unsigned int)st->st_ino)
- changed |= INODE_CHANGED;
- if (ce->st_size != (unsigned int)st->st_size)
- changed |= DATA_CHANGED;
- return changed;
-}
-
static void show_differences(struct cache_entry *ce, struct stat *cur,
void *old_contents, unsigned long long old_size)
{
@@ -68,7 +38,7 @@ int main(int argc, char **argv)
printf("%s: %s\n", ce->name, strerror(errno));
continue;
}
- changed = match_stat(ce, &st);
+ changed = cache_match_stat(ce, &st);
if (!changed) {
printf("%s: ok\n", ce->name);
continue;