Merge branch 'bw/read-blob-data-does-not-modify-index-state'

gitster · gitster · commit a06b4c337cbf · 2017-01-23T15:59:19.000-08:00
Code clean-up.

* bw/read-blob-data-does-not-modify-index-state:
  index: improve constness for reading blob data
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -2285,7 +2285,8 @@ int index_name_is_other(const struct index_state istate, const char name,`
`2285`	`2285`	`return 1;`
`2286`	`2286`	`}`
`2287`	`2287`
`2288`		`-void read_blob_data_from_index(struct index_state istate, const char path, unsigned long size)`
	`2288`	`+void read_blob_data_from_index(const struct index_state istate,`
	`2289`	`+ const char path, unsigned long size)`
`2289`	`2290`	`{`
`2290`	`2291`	`int pos, len;`
`2291`	`2292`	`unsigned long sz;`