sha1_file: add a "read_sha1_file_repl" function

chriscool · gitster · commit f5552aee39d6 · 2009-05-31T17:02:59.000-07:00
This new function will replace "read_sha1_file". This latter function
becoming just a stub to call the former will a NULL "replacement"
argument.

This new function is needed because sometimes we need to use the
replacement sha1.

Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -649,7 +649,11 @@ char *strip_path_suffix(const char *path, const char *suffix);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int sha1_object_info(const unsigned char *, unsigned long *);
-extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);
+extern void *read_sha1_file_repl(const unsigned char *sha1, enum object_type *type, unsigned long *size, const unsigned char **replacement);
+static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
+{
+	return read_sha1_file_repl(sha1, type, size, NULL);
+}
 extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
 extern int write_sha1_file(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 *);
diff --git a/sha1_file.c b/sha1_file.c
@@ -2145,8 +2145,10 @@ static void *read_object(const unsigned char *sha1, enum object_type *type,
 	return read_packed_sha1(sha1, type, size);
 }
 
-void *read_sha1_file(const unsigned char *sha1, enum object_type *type,
-		     unsigned long *size)
+void *read_sha1_file_repl(const unsigned char *sha1,
+			  enum object_type *type,
+			  unsigned long *size,
+			  const unsigned char **replacement)
 {
 	const unsigned char *repl = lookup_replace_object(sha1);
 	void *data = read_object(repl, type, size);
@@ -2160,6 +2162,9 @@ void *read_sha1_file(const unsigned char *sha1, enum object_type *type,
 	if (!data && (has_loose_object(repl) || has_packed_and_bad(repl)))
 		die("object %s is corrupted", sha1_to_hex(repl));
 
+	if (replacement)
+		*replacement = repl;
+
 	return data;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2145,8 +2145,10 @@ static void read_object(const unsigned char sha1, enum object_type *type,`
`2145`	`2145`	`return read_packed_sha1(sha1, type, size);`
`2146`	`2146`	`}`
`2147`	`2147`
`2148`		`-void read_sha1_file(const unsigned char sha1, enum object_type *type,`
`2149`		`- unsigned long *size)`
	`2148`	`+void read_sha1_file_repl(const unsigned char sha1,`
	`2149`	`+ enum object_type *type,`
	`2150`	`+ unsigned long *size,`
	`2151`	`+ const unsigned char **replacement)`
`2150`	`2152`	`{`
`2151`	`2153`	`const unsigned char *repl = lookup_replace_object(sha1);`
`2152`	`2154`	`void *data = read_object(repl, type, size);`
`@@ -2160,6 +2162,9 @@ void read_sha1_file(const unsigned char sha1, enum object_type *type,`
`2160`	`2162`	`if (!data && (has_loose_object(repl) \|\| has_packed_and_bad(repl)))`
`2161`	`2163`	`die("object %s is corrupted", sha1_to_hex(repl));`
`2162`	`2164`
	`2165`	`+ if (replacement)`
	`2166`	`+ *replacement = repl;`
	`2167`	`+`
`2163`	`2168`	`return data;`
`2164`	`2169`	`}`
`2165`	`2170`