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

link_alt_odb_entries(): take (char *, len) rather than two pointers

Browse Source 
Change link_alt_odb_entries() to take the length of the "alt"
parameter rather than a pointer to the end of the "alt" string.  This
is the more common calling convention and simplifies the code a tiny
bit.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Michael Haggerty 2012-11-05 09:41:23 +01:00 committed by Jeff King
parent 6eac50d827
commit c595016402
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sha1_file.c
View File

@ -317,7 +317,7 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, int
return 0; return 0;
} }
static void link_alt_odb_entries(const char *alt, const char *ep, int sep, static void link_alt_odb_entries(const char *alt, int len, int sep,
const char *relative_base, int depth) const char *relative_base, int depth)
{ {
struct string_list entries = STRING_LIST_INIT_NODUP; struct string_list entries = STRING_LIST_INIT_NODUP;
@ -330,7 +330,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
return; return;
} }
alt_copy = xmemdupz(alt, ep - alt); alt_copy = xmemdupz(alt, len);
string_list_split_in_place(&entries, alt_copy, sep, -1); string_list_split_in_place(&entries, alt_copy, sep, -1);
for (i = 0; i < entries.nr; i++) { for (i = 0; i < entries.nr; i++) {
const char *entry = entries.items[i].string; const char *entry = entries.items[i].string;
@ -371,7 +371,7 @@ void read_info_alternates(const char * relative_base, int depth)
map = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, fd, 0); map = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, fd, 0);
close(fd); close(fd);
link_alt_odb_entries(map, map + mapsz, '\n', relative_base, depth); link_alt_odb_entries(map, mapsz, '\n', relative_base, depth);
munmap(map, mapsz); munmap(map, mapsz);
} }
@ -385,7 +385,7 @@ void add_to_alternates_file(const char *reference)
if (commit_lock_file(lock)) if (commit_lock_file(lock))
die("could not close alternates file"); die("could not close alternates file");
if (alt_odb_tail) if (alt_odb_tail)
link_alt_odb_entries(alt, alt + strlen(alt), '\n', NULL, 0); link_alt_odb_entries(alt, strlen(alt), '\n', NULL, 0);
} }
void foreach_alt_odb(alt_odb_fn fn, void *cb) void foreach_alt_odb(alt_odb_fn fn, void *cb)
@ -409,7 +409,7 @@ void prepare_alt_odb(void)
if (!alt) alt = ""; if (!alt) alt = "";
alt_odb_tail = &alt_odb_list; alt_odb_tail = &alt_odb_list;
link_alt_odb_entries(alt, alt + strlen(alt), PATH_SEP, NULL, 0); link_alt_odb_entries(alt, strlen(alt), PATH_SEP, NULL, 0);
read_info_alternates(get_object_directory(), 0); read_info_alternates(get_object_directory(), 0);
} }