read_blob_data_from_index(): optionally return the size of blob data

Lukas Fleischer · gitster · commit ff36682505df · 2013-04-17T09:51:47.000-07:00
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 &lt;git@cryptocrack.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/attr.c b/attr.c
@@ -387,7 +387,7 @@ static struct attr_stack *read_attr_from_index(const char *path, int macro_ok)
 	char *buf, *sp;
 	int lineno = 0;
 
-	buf = read_blob_data_from_index(use_index ? use_index : &the_index, path);
+	buf = read_blob_data_from_index(use_index ? use_index : &the_index, path, NULL);
 	if (!buf)
 		return NULL;
 
diff --git 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
diff --git a/read-cache.c b/read-cache.c
@@ -1896,7 +1896,7 @@ 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)
+void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
 {
 	int pos, len;
 	unsigned long sz;
@@ -1925,5 +1925,7 @@ void *read_blob_data_from_index(struct index_state *istate, const char *path)
 		free(data);
 		return NULL;
 	}
+	if (size)
+		*size = sz;
 	return data;
 }

Original file line number	Diff line number	Diff line change
`@@ -1896,7 +1896,7 @@ int index_name_is_other(const struct index_state istate, const char name,`
`1896`	`1896`	`return 1;`
`1897`	`1897`	`}`
`1898`	`1898`
`1899`		`-void read_blob_data_from_index(struct index_state istate, const char *path)`
	`1899`	`+void read_blob_data_from_index(struct index_state istate, const char path, unsigned long size)`
`1900`	`1900`	`{`
`1901`	`1901`	`int pos, len;`
`1902`	`1902`	`unsigned long sz;`
`@@ -1925,5 +1925,7 @@ void read_blob_data_from_index(struct index_state istate, const char *path)`
`1925`	`1925`	`free(data);`
`1926`	`1926`	`return NULL;`
`1927`	`1927`	`}`
	`1928`	`+ if (size)`
	`1929`	`+ *size = sz;`
`1928`	`1930`	`return data;`
`1929`	`1931`	`}`