undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/sha1-file-cleanup' into maint

Browse Source 
Code clean-up.

* sb/sha1-file-cleanup:
  sha1_file: make read_info_alternates static
This commit is contained in:
Junio C Hamano 2017-09-10 17:03:04 +09:00
commit f04f860dfa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -1545,7 +1545,6 @@ extern struct alternate_object_database {
char path[FLEX_ARRAY]; char path[FLEX_ARRAY];
} *alt_odb_list; } *alt_odb_list;
extern void prepare_alt_odb(void); 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); extern char *compute_alternate_path(const char *path, struct strbuf *err);
typedef int alt_odb_fn(struct alternate_object_database *, void *); typedef int alt_odb_fn(struct alternate_object_database *, void *);
extern int foreach_alt_odb(alt_odb_fn, void*); extern int foreach_alt_odb(alt_odb_fn, void*);

3
sha1_file.c
View File

@ -347,6 +347,7 @@ static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir)
* SHA1, an extra slash for the first level indirection, and the * SHA1, an extra slash for the first level indirection, and the
* terminating NUL. * 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, static int link_alt_odb_entry(const char *entry, const char *relative_base,
int depth, const char *normalized_objdir) int depth, const char *normalized_objdir)
{ {
@ -448,7 +449,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; char *map;
size_t mapsz; size_t mapsz;