sha1_file: make read_info_alternates static

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>

diff --git a/cache.h b/cache.h
index 258ce6b0f06d7395818c8cd2e2de96fe894f29c0..11a2bcd38b3e33faed9ea7c655c878997423c89a 100644 (file)
--- 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);
        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*);
 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 7a3b74544803fb151b44fe76eab4b95b2ccaaa2c..fac860ad9bbcc79866f0dd1bb8100af77b6d5ab9 100644 (file)
--- 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.
  */
  * 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)
 {
 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);
 }
 
        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;
 {
        char *map;
        size_t mapsz;