summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-01-10 12:06:10 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-11 13:35:13 -0800
commit875425080df13933baf484b35988d3a2dc04629e (patch)
treeba8ba5834a6e254b7614af4487a6ee694e7fb11d
parentd7dffce1cebde29a0c4b309a79e4345450bf352a (diff)
downloadgit-bw/read-blob-data-does-not-modify-index-state.tar.gz
index: improve constness for reading blob databw/read-blob-data-does-not-modify-index-state
Improve constness of the index_state parameter to the 'read_blob_data_from_index' function. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 1b67f078dd..ef89eb4a0f 100644
--- a/cache.h
+++ b/cache.h
@@ -599,7 +599,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;