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>
Stefan Beller committed
Aug 15, 2017 at 13:13 UTC
2456990dfd93dee6d1906d774db112056534b57b
2 files changed
+2
-2
cache.h
-1
@@ -1387,7 +1387,6 @@ extern struct alternate_object_database {
1387
char base[FLEX_ARRAY]; /* more */
1388
} *alt_odb_list;
1389
extern void prepare_alt_odb(void);
1390
-extern void read_info_alternates(const char * relative_base, int depth);
1390
extern char *compute_alternate_path(const char *path, struct strbuf *err);
1391
typedef int alt_odb_fn(struct alternate_object_database *, void *);
1392
extern int foreach_alt_odb(alt_odb_fn, void*);
sha1_file.c
+2
-1
@@ -279,6 +279,7 @@ static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir)
279
* SHA1, an extra slash for the first level indirection, and the
280
* terminating NUL.
281
*/
282
+static void read_info_alternates(const char * relative_base, int depth);
283
static int link_alt_odb_entry(const char *entry, const char *relative_base,
284
int depth, const char *normalized_objdir)
285
{
@@ -369,7 +370,7 @@ static void link_alt_odb_entries(const char *alt, int len, int sep,
370
strbuf_release(&objdirbuf);
371
}
372
372
-void read_info_alternates(const char * relative_base, int depth)
373
+static void read_info_alternates(const char * relative_base, int depth)
374
{
375
char *map;
376
size_t mapsz;