fetch-pack: simplify add_sought_entry
We have two variants of this function, one that takes a string and one that takes a ptr/len combo. But we only call the latter with the length of a NUL-terminated string, so our first simplification is to drop it in favor of the string variant. Since we know we have a string, we can also replace the manual memory computation with a call to alloc_ref(). Furthermore, we can rely on get_oid_hex() to complain if it hits the end of the string. That means we can simplify the check for "<sha1> <ref>" versus just "<ref>". Rather than manage the ptr/len pair, we can just bump the start of our string forward. The original code over-allocated based on the original "namelen" (which wasn't _wrong_, but was simply wasteful and confusing). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a78c188a32
commit
5545f057d4
@ -10,33 +10,24 @@ static const char fetch_pack_usage[] =
|
||||
"[--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] "
|
||||
"[--no-progress] [--diag-url] [-v] [<host>:]<directory> [<refs>...]";
|
||||
|
||||
static void add_sought_entry_mem(struct ref ***sought, int *nr, int *alloc,
|
||||
const char *name, int namelen)
|
||||
static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
|
||||
const char *name)
|
||||
{
|
||||
struct ref *ref = xcalloc(1, sizeof(*ref) + namelen + 1);
|
||||
struct ref *ref;
|
||||
struct object_id oid;
|
||||
const int chunksz = GIT_SHA1_HEXSZ + 1;
|
||||
|
||||
if (namelen > chunksz && name[chunksz - 1] == ' ' &&
|
||||
!get_oid_hex(name, &oid)) {
|
||||
oidcpy(&ref->old_oid, &oid);
|
||||
name += chunksz;
|
||||
namelen -= chunksz;
|
||||
}
|
||||
if (!get_oid_hex(name, &oid) && name[GIT_SHA1_HEXSZ] == ' ')
|
||||
name += GIT_SHA1_HEXSZ + 1;
|
||||
else
|
||||
oidclr(&oid);
|
||||
|
||||
memcpy(ref->name, name, namelen);
|
||||
ref->name[namelen] = '\0';
|
||||
ref = alloc_ref(name);
|
||||
oidcpy(&ref->old_oid, &oid);
|
||||
(*nr)++;
|
||||
ALLOC_GROW(*sought, *nr, *alloc);
|
||||
(*sought)[*nr - 1] = ref;
|
||||
}
|
||||
|
||||
static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
|
||||
const char *string)
|
||||
{
|
||||
add_sought_entry_mem(sought, nr, alloc, string, strlen(string));
|
||||
}
|
||||
|
||||
int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int i, ret;
|
||||
|
Loading…
Reference in New Issue
Block a user