sha1_file: add a "read_sha1_file_repl" function

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 <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Christian Couder committed Jan 23, 2009 at 10:07 UTC f5552aee39d664bb8774c205341abd6db74b38d3

2 files changed +12 -3

cache.h

+5 -1

@@ -649,7 +649,11 @@ char *strip_path_suffix(const char *path, const char *suffix);

649

650 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */

651 extern int sha1_object_info(const unsigned char *, unsigned long *);

652 -extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);

652 +extern void *read_sha1_file_repl(const unsigned char *sha1, enum object_type *type, unsigned long *size, const unsigned char **replacement);

653 +static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)

654 +{

655 + return read_sha1_file_repl(sha1, type, size, NULL);

656 +}

657 extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);

658 extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);

659 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);

sha1_file.c

+7 -2

@@ -2145,8 +2145,10 @@ static void *read_object(const unsigned char *sha1, enum object_type *type,

2145 return read_packed_sha1(sha1, type, size);

2146 }

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)

2152 {

2153 const unsigned char *repl = lookup_replace_object(sha1);

2154 void *data = read_object(repl, type, size);

@@ -2160,6 +2162,9 @@ void *read_sha1_file(const unsigned char *sha1, enum object_type *type,

2162 if (!data && (has_loose_object(repl) || has_packed_and_bad(repl)))

2163 die("object %s is corrupted", sha1_to_hex(repl));

2164

2165 + if (replacement)

2166 + *replacement = repl;

2167 +

2168 return data;

2169 }

2170