sha1_file.c: expose helpers to read loose objects

gitster · gitster · commit f0270efd460e · 2011-05-20T23:16:53.000-07:00
Make map_sha1_file(), parse_sha1_header() and unpack_sha1_header()
available to the streaming read API by exporting them via cache.h header
file.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -780,6 +780,9 @@ extern int hash_sha1_file(const void *buf, unsigned long len, const char *type,
 extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
 extern int force_object_loose(const unsigned char *sha1, time_t mtime);
+extern void *map_sha1_file(const unsigned char *sha1, unsigned long *size);
+extern int unpack_sha1_header(z_stream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
+extern int parse_sha1_header(const char *hdr, unsigned long *sizep);
 
 /* global flag to enable extra checks when accessing packed objects */
 extern int do_check_packed_object_crc;
diff --git a/sha1_file.c b/sha1_file.c
@@ -1186,7 +1186,7 @@ static int open_sha1_file(const unsigned char *sha1)
 	return -1;
 }
 
-static void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
+void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
 {
 	void *map;
 	int fd;
@@ -1245,7 +1245,7 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
 	return used;
 }
 
-static int unpack_sha1_header(z_stream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz)
+int unpack_sha1_header(z_stream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz)
 {
 	unsigned long size, used;
 	static const char valid_loose_object_type[8] = {
@@ -1342,7 +1342,7 @@ static void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size
  * too permissive for what we want to check. So do an anal
  * object header parse by hand.
  */
-static int parse_sha1_header(const char *hdr, unsigned long *sizep)
+int parse_sha1_header(const char *hdr, unsigned long *sizep)
 {
 	char type[10];
 	int i;

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ static int open_sha1_file(const unsigned char *sha1)`
`1186`	`1186`	`return -1;`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`		`-static void map_sha1_file(const unsigned char sha1, unsigned long *size)`
	`1189`	`+void map_sha1_file(const unsigned char sha1, unsigned long *size)`
`1190`	`1190`	`{`
`1191`	`1191`	`void *map;`
`1192`	`1192`	`int fd;`
`@@ -1245,7 +1245,7 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,`
`1245`	`1245`	`return used;`
`1246`	`1246`	`}`
`1247`	`1247`
`1248`		`-static int unpack_sha1_header(z_stream stream, unsigned char map, unsigned long mapsize, void *buffer, unsigned long bufsiz)`
	`1248`	`+int unpack_sha1_header(z_stream stream, unsigned char map, unsigned long mapsize, void *buffer, unsigned long bufsiz)`
`1249`	`1249`	`{`
`1250`	`1250`	`unsigned long size, used;`
`1251`	`1251`	`static const char valid_loose_object_type[8] = {`
`@@ -1342,7 +1342,7 @@ static void unpack_sha1_rest(z_stream stream, void *buffer, unsigned long size`
`1342`	`1342`	`* too permissive for what we want to check. So do an anal`
`1343`	`1343`	`* object header parse by hand.`
`1344`	`1344`	`*/`
`1345`		`-static int parse_sha1_header(const char hdr, unsigned long sizep)`
	`1345`	`+int parse_sha1_header(const char hdr, unsigned long sizep)`
`1346`	`1346`	`{`
`1347`	`1347`	`char type[10];`
`1348`	`1348`	`int i;`