sha1_file: allow map_sha1_file to handle arbitrary repositories

stefanbeller · gitster · commit bd27f50c8014 · 2018-03-26T10:05:55.000-07:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/object-store.h b/object-store.h
@@ -127,7 +127,6 @@ void raw_object_store_clear(struct raw_object_store *o);
  */
 void sha1_file_name(struct repository *r, struct strbuf *buf, const unsigned char *sha1);
 
-#define map_sha1_file(r, s, sz) map_sha1_file_##r(s, sz)
-void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size);
+void *map_sha1_file(struct repository *r, const unsigned char *sha1, unsigned long *size);
 
 #endif /* OBJECT_STORE_H */
diff --git a/sha1_file.c b/sha1_file.c
@@ -957,9 +957,10 @@ static void *map_sha1_file_1(struct repository *r, const char *path,
 	return map;
 }
 
-void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size)
+void *map_sha1_file(struct repository *r,
+		    const unsigned char *sha1, unsigned long *size)
 {
-	return map_sha1_file_1(the_repository, NULL, sha1, size);
+	return map_sha1_file_1(r, NULL, sha1, size);
 }
 
 static int unpack_sha1_short_header(git_zstream *stream,

Original file line number	Diff line number	Diff line change
`@@ -957,9 +957,10 @@ static void map_sha1_file_1(struct repository r, const char *path,`
`957`	`957`	`return map;`
`958`	`958`	`}`
`959`	`959`
`960`		`-void map_sha1_file_the_repository(const unsigned char sha1, unsigned long *size)`
	`960`	`+void map_sha1_file(struct repository r,`
	`961`	`+ const unsigned char sha1, unsigned long size)`
`961`	`962`	`{`
`962`		`- return map_sha1_file_1(the_repository, NULL, sha1, size);`
	`963`	`+ return map_sha1_file_1(r, NULL, sha1, size);`
`963`	`964`	`}`
`964`	`965`
`965`	`966`	`static int unpack_sha1_short_header(git_zstream *stream,`