read-cache: mark cache_entry pointers const

ie_match_stat and ie_modified only derefence their struct cache_entry
pointers for reading.  Add const to the parameter declaration here and
do the same for the static helper function used by them, as it's the
same there as well.  This allows callers to pass in const pointers.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 43a27e7b338496b218da22e7e57ed45a0b7fddf9..01e8760ecff19d1ae0ef3bb2d0989bc3c74e789d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -482,8 +482,8 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig
 #define CE_MATCH_RACY_IS_DIRTY         02
 /* do stat comparison even if CE_SKIP_WORKTREE is true */
 #define CE_MATCH_IGNORE_SKIP_WORKTREE  04
 #define CE_MATCH_RACY_IS_DIRTY         02
 /* do stat comparison even if CE_SKIP_WORKTREE is true */
 #define CE_MATCH_IGNORE_SKIP_WORKTREE  04

-extern int ie_match_stat(const struct index_state *, struct cache_entry *, struct stat *, unsigned int);
-extern int ie_modified(const struct index_state *, struct cache_entry *, struct stat *, unsigned int);
+extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
+extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);

 
 #define PATHSPEC_ONESTAR 1     /* the pathspec pattern sastisfies GFNM_ONESTAR */
 
 
 #define PATHSPEC_ONESTAR 1     /* the pathspec pattern sastisfies GFNM_ONESTAR */
 

diff --git a/read-cache.c b/read-cache.c
index 04ed561bfe7dd8fbf1988190f95eb1cc3530ff58..e6e046687e130dd0a926d0761cba95fc18e1a96c 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -91,7 +91,7 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
                ce_mark_uptodate(ce);
 }
 
                ce_mark_uptodate(ce);
 }
 

-static int ce_compare_data(struct cache_entry *ce, struct stat *st)
+static int ce_compare_data(const struct cache_entry *ce, struct stat *st)

 {
        int match = -1;
        int fd = open(ce->name, O_RDONLY);
 {
        int match = -1;
        int fd = open(ce->name, O_RDONLY);


@@ -105,7 +105,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
        return match;
 }
 
        return match;
 }
 

-static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
+static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)

 {
        int match = -1;
        void *buffer;
 {
        int match = -1;
        void *buffer;


@@ -126,7 +126,7 @@ static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
        return match;
 }
 
        return match;
 }
 

-static int ce_compare_gitlink(struct cache_entry *ce)
+static int ce_compare_gitlink(const struct cache_entry *ce)

 {
        unsigned char sha1[20];
 
 {
        unsigned char sha1[20];
 


@@ -143,7 +143,7 @@ static int ce_compare_gitlink(struct cache_entry *ce)
        return hashcmp(sha1, ce->sha1);
 }
 
        return hashcmp(sha1, ce->sha1);
 }
 

-static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
+static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)

 {
        switch (st->st_mode & S_IFMT) {
        case S_IFREG:
 {
        switch (st->st_mode & S_IFMT) {
        case S_IFREG:


@@ -163,7 +163,7 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
        return 0;
 }
 
        return 0;
 }
 

-static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
+static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)

 {
        unsigned int changed = 0;
 
 {
        unsigned int changed = 0;
 


@@ -239,7 +239,8 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
        return changed;
 }
 
        return changed;
 }
 

-static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
+static int is_racy_timestamp(const struct index_state *istate,
+                            const struct cache_entry *ce)

 {
        return (!S_ISGITLINK(ce->ce_mode) &&
                istate->timestamp.sec &&
 {
        return (!S_ISGITLINK(ce->ce_mode) &&
                istate->timestamp.sec &&


@@ -255,7 +256,7 @@ static int is_racy_timestamp(const struct index_state *istate, struct cache_entr
 }
 
 int ie_match_stat(const struct index_state *istate,
 }
 
 int ie_match_stat(const struct index_state *istate,

-                 struct cache_entry *ce, struct stat *st,
+                 const struct cache_entry *ce, struct stat *st,

                  unsigned int options)
 {
        unsigned int changed;
                  unsigned int options)
 {
        unsigned int changed;


@@ -311,7 +312,8 @@ int ie_match_stat(const struct index_state *istate,
 }
 
 int ie_modified(const struct index_state *istate,
 }
 
 int ie_modified(const struct index_state *istate,

-               struct cache_entry *ce, struct stat *st, unsigned int options)
+               const struct cache_entry *ce,
+               struct stat *st, unsigned int options)

 {
        int changed, changed_fs;
 
 {
        int changed, changed_fs;