summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLukas Fleischer <git@cryptocrack.de>2013-04-13 13:28:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-17 16:51:47 (GMT)
commitff36682505dfb580172306fe1b265b860f89bcea (patch)
treea3310d5640445f9a911563a55077e5aebeefac4c /cache.h
parent29fb37b272debaf4f5f6eb7cf476de9274492930 (diff)
downloadgit-ff36682505dfb580172306fe1b265b860f89bcea.zip
git-ff36682505dfb580172306fe1b265b860f89bcea.tar.gz
git-ff36682505dfb580172306fe1b265b860f89bcea.tar.bz2
read_blob_data_from_index(): optionally return the size of blob data
This allows for optionally getting the size of the returned data and will be used in a follow-up patch. Signed-off-by: Lukas Fleischer <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 5d66c74..627776b 100644
--- a/cache.h
+++ b/cache.h
@@ -307,7 +307,7 @@ extern void free_name_hash(struct index_state *istate);
#define resolve_undo_clear() resolve_undo_clear_index(&the_index)
#define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
#define unmerge_cache(pathspec) unmerge_index(&the_index, pathspec)
-#define read_blob_data_from_cache(path) read_blob_data_from_index(&the_index, (path))
+#define read_blob_data_from_cache(path, sz) read_blob_data_from_index(&the_index, (path), (sz))
#endif
enum object_type {
@@ -453,7 +453,7 @@ extern int add_file_to_index(struct index_state *, const char *path, int flags);
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
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 *);
+extern void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);
/* do stat comparison even if CE_VALID is true */
#define CE_MATCH_IGNORE_VALID 01