Add 'const' where appropriate to index handling functions

This is in an effort to make the source index of 'unpack_trees()' as
being const, and thus making the compiler help us verify that we only
access it for reading.

The constification also extended to some of the hashing helpers that get
called indirectly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 6eb16cb0df4cf39602fa3fbb7a666a7343962aa9..b519b7a0c374f71c57360895a05cd38b22b70964 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -346,12 +346,12 @@ extern void verify_non_filename(const char *prefix, const char *name);
 /* Initialize and use the cache information */
 extern int read_index(struct index_state *);
 extern int read_index_from(struct index_state *, const char *path);
 /* Initialize and use the cache information */
 extern int read_index(struct index_state *);
 extern int read_index_from(struct index_state *, const char *path);

-extern int write_index(struct index_state *, int newfd);
+extern int write_index(const struct index_state *, int newfd);

 extern int discard_index(struct index_state *);
 extern int discard_index(struct index_state *);

-extern int unmerged_index(struct index_state *);
+extern int unmerged_index(const struct index_state *);

 extern int verify_path(const char *path);
 extern int index_name_exists(struct index_state *istate, const char *name, int namelen);
 extern int verify_path(const char *path);
 extern int index_name_exists(struct index_state *istate, const char *name, int namelen);

-extern int index_name_pos(struct index_state *, const char *name, int namelen);
+extern int index_name_pos(const struct index_state *, const char *name, int namelen);

 #define ADD_CACHE_OK_TO_ADD 1          /* Ok to add */
 #define ADD_CACHE_OK_TO_REPLACE 2      /* Ok to replace file/directory */
 #define ADD_CACHE_SKIP_DFCHECK 4       /* Ok to skip DF conflict checks */
 #define ADD_CACHE_OK_TO_ADD 1          /* Ok to add */
 #define ADD_CACHE_OK_TO_REPLACE 2      /* Ok to replace file/directory */
 #define ADD_CACHE_SKIP_DFCHECK 4       /* Ok to skip DF conflict checks */


@@ -368,8 +368,8 @@ extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
 #define CE_MATCH_IGNORE_VALID          01
 /* do not check the contents but report dirty on racily-clean entries */
 #define CE_MATCH_RACY_IS_DIRTY 02
 #define CE_MATCH_IGNORE_VALID          01
 /* do not check the contents but report dirty on racily-clean entries */
 #define CE_MATCH_RACY_IS_DIRTY 02

-extern int ie_match_stat(struct index_state *, struct cache_entry *, struct stat *, unsigned int);
-extern int ie_modified(struct index_state *, struct cache_entry *, struct stat *, unsigned int);
+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 ce_path_match(const struct cache_entry *ce, const char **pathspec);
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
 
 extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);

diff --git a/hash.c b/hash.c
index d9ec82fa663804210e8ef200f2f300e914662f22..1cd4c9d5c0945994b84bb25edd6e4685cf76b5c5 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -9,7 +9,7 @@
  * the existing entry, or the empty slot if none existed. The caller
  * can then look at the (*ptr) to see whether it existed or not.
  */
  * the existing entry, or the empty slot if none existed. The caller
  * can then look at the (*ptr) to see whether it existed or not.
  */

-static struct hash_table_entry *lookup_hash_entry(unsigned int hash, struct hash_table *table)
+static struct hash_table_entry *lookup_hash_entry(unsigned int hash, const struct hash_table *table)

 {
        unsigned int size = table->size, nr = hash % size;
        struct hash_table_entry *array = table->array;
 {
        unsigned int size = table->size, nr = hash % size;
        struct hash_table_entry *array = table->array;


@@ -66,7 +66,7 @@ static void grow_hash_table(struct hash_table *table)
        free(old_array);
 }
 
        free(old_array);
 }
 

-void *lookup_hash(unsigned int hash, struct hash_table *table)
+void *lookup_hash(unsigned int hash, const struct hash_table *table)

 {
        if (!table->array)
                return NULL;
 {
        if (!table->array)
                return NULL;


@@ -81,7 +81,7 @@ void **insert_hash(unsigned int hash, void *ptr, struct hash_table *table)
        return insert_hash_entry(hash, ptr, table);
 }
 
        return insert_hash_entry(hash, ptr, table);
 }
 

-int for_each_hash(struct hash_table *table, int (*fn)(void *))
+int for_each_hash(const struct hash_table *table, int (*fn)(void *))

 {
        int sum = 0;
        unsigned int i;
 {
        int sum = 0;
        unsigned int i;

diff --git a/hash.h b/hash.h
index a8b0fbb5b502669f0e6f5db55e4573b8277c04d2..69e33a47b9861df9ac12c354eae180b4f8fea857 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -28,9 +28,9 @@ struct hash_table {
        struct hash_table_entry *array;
 };
 
        struct hash_table_entry *array;
 };
 

-extern void *lookup_hash(unsigned int hash, struct hash_table *table);
+extern void *lookup_hash(unsigned int hash, const struct hash_table *table);

 extern void **insert_hash(unsigned int hash, void *ptr, struct hash_table *table);
 extern void **insert_hash(unsigned int hash, void *ptr, struct hash_table *table);

-extern int for_each_hash(struct hash_table *table, int (*fn)(void *));
+extern int for_each_hash(const struct hash_table *table, int (*fn)(void *));

 extern void free_hash(struct hash_table *table);
 
 static inline void init_hash(struct hash_table *table)
 extern void free_hash(struct hash_table *table);
 
 static inline void init_hash(struct hash_table *table)

diff --git a/read-cache.c b/read-cache.c
index bf649a31a887154ae2e6383d7452915287ae62d6..a92b25b59bf0e096942bca126542a1ea411b525b 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -255,13 +255,13 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
        return changed;
 }
 
        return changed;
 }
 

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

 {
        return (istate->timestamp &&
                ((unsigned int)istate->timestamp) <= ce->ce_mtime);
 }
 
 {
        return (istate->timestamp &&
                ((unsigned int)istate->timestamp) <= ce->ce_mtime);
 }
 

-int ie_match_stat(struct index_state *istate,
+int ie_match_stat(const struct index_state *istate,

                  struct cache_entry *ce, struct stat *st,
                  unsigned int options)
 {
                  struct cache_entry *ce, struct stat *st,
                  unsigned int options)
 {


@@ -304,7 +304,7 @@ int ie_match_stat(struct index_state *istate,
        return changed;
 }
 
        return changed;
 }
 

-int ie_modified(struct index_state *istate,
+int ie_modified(const struct index_state *istate,

                struct cache_entry *ce, struct stat *st, unsigned int options)
 {
        int changed, changed_fs;
                struct cache_entry *ce, struct stat *st, unsigned int options)
 {
        int changed, changed_fs;


@@ -412,7 +412,7 @@ int cache_name_compare(const char *name1, int flags1, const char *name2, int fla
        return 0;
 }
 
        return 0;
 }
 

-int index_name_pos(struct index_state *istate, const char *name, int namelen)
+int index_name_pos(const struct index_state *istate, const char *name, int namelen)

 {
        int first, last;
 
 {
        int first, last;
 


@@ -1201,7 +1201,7 @@ int discard_index(struct index_state *istate)
        return 0;
 }
 
        return 0;
 }
 

-int unmerged_index(struct index_state *istate)
+int unmerged_index(const struct index_state *istate)

 {
        int i;
        for (i = 0; i < istate->cache_nr; i++) {
 {
        int i;
        for (i = 0; i < istate->cache_nr; i++) {


@@ -1346,7 +1346,7 @@ static int ce_write_entry(SHA_CTX *c, int fd, struct cache_entry *ce)
        return ce_write(c, fd, ondisk, size);
 }
 
        return ce_write(c, fd, ondisk, size);
 }
 

-int write_index(struct index_state *istate, int newfd)
+int write_index(const struct index_state *istate, int newfd)

 {
        SHA_CTX c;
        struct cache_header hdr;
 {
        SHA_CTX c;
        struct cache_header hdr;