summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-08-15 13:13:19 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-15 14:39:25 -0700
commit2456990dfd93dee6d1906d774db112056534b57b (patch)
tree77e29099725f97489df2447d834a4ce5c9c94609
parenta5b34d21521c015cd41ced4a3fdde57d79891eb3 (diff)
downloadgit-2456990dfd93dee6d1906d774db112056534b57b.tar.gz
sha1_file: make read_info_alternates staticsb/sha1-file-cleanup
read_info_alternates is not used from outside, so let's make it static. We have to declare the function before link_alt_odb_entry instead of moving the code around, link_alt_odb_entry calls read_info_alternates, which in turn calls link_alt_odb_entry. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h1
-rw-r--r--sha1_file.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 258ce6b0f0..11a2bcd38b 100644
--- a/cache.h
+++ b/cache.h
@@ -1387,7 +1387,6 @@ extern struct alternate_object_database {
char base[FLEX_ARRAY]; /* more */
} *alt_odb_list;
extern void prepare_alt_odb(void);
-extern void read_info_alternates(const char * relative_base, int depth);
extern char *compute_alternate_path(const char *path, struct strbuf *err);
typedef int alt_odb_fn(struct alternate_object_database *, void *);
extern int foreach_alt_odb(alt_odb_fn, void*);
diff --git a/sha1_file.c b/sha1_file.c
index 7a3b745448..fac860ad9b 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -279,6 +279,7 @@ static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir)
* SHA1, an extra slash for the first level indirection, and the
* terminating NUL.
*/
+static void read_info_alternates(const char * relative_base, int depth);
static int link_alt_odb_entry(const char *entry, const char *relative_base,
int depth, const char *normalized_objdir)
{
@@ -369,7 +370,7 @@ static void link_alt_odb_entries(const char *alt, int len, int sep,
strbuf_release(&objdirbuf);
}
-void read_info_alternates(const char * relative_base, int depth)
+static void read_info_alternates(const char * relative_base, int depth)
{
char *map;
size_t mapsz;