summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-23 15:59:19 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-23 15:59:19 -0800
commita06b4c337cbfdf70709d2092ecdcd84f4e20ecb3 (patch)
tree13b87a40c90078c63b6de8c15fa329b8bccc5afd
parent787f75f0567aa8c7347544c65e9d3bc6640a27d4 (diff)
parent875425080df13933baf484b35988d3a2dc04629e (diff)
downloadgit-a06b4c337cbfdf70709d2092ecdcd84f4e20ecb3.tar.gz
Merge branch 'bw/read-blob-data-does-not-modify-index-state'
Code clean-up. * bw/read-blob-data-does-not-modify-index-state: index: improve constness for reading blob data
-rw-r--r--cache.h2
-rw-r--r--read-cache.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 40f7ddd247..00a029af36 100644
--- a/cache.h
+++ b/cache.h
@@ -598,7 +598,7 @@ extern int chmod_index_entry(struct index_state *, struct cache_entry *ce, char
extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
extern int index_name_is_other(const struct index_state *, const char *, int);
-extern void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);
+extern void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *);
/* do stat comparison even if CE_VALID is true */
#define CE_MATCH_IGNORE_VALID 01
diff --git a/read-cache.c b/read-cache.c
index 2eca639cce..7a9a7de91e 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2285,7 +2285,8 @@ int index_name_is_other(const struct index_state *istate, const char *name,
return 1;
}
-void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
+void *read_blob_data_from_index(const struct index_state *istate,
+ const char *path, unsigned long *size)
{
int pos, len;
unsigned long sz;