Skip to content

Commit

Permalink
add_sought_entry_mem: convert to struct object_id
Browse files Browse the repository at this point in the history
Convert this function to use struct object_id.  Express several
hardcoded constants in terms of GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
  • Loading branch information
brian m. carlson authored and Jeff King committed Nov 20, 2015
1 parent f4e54d0 commit 854ecb9
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions builtin/fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ static void add_sought_entry_mem(struct ref ***sought, int *nr, int *alloc,
const char *name, int namelen)
{
struct ref *ref = xcalloc(1, sizeof(*ref) + namelen + 1);
unsigned char sha1[20];

if (namelen > 41 && name[40] == ' ' && !get_sha1_hex(name, sha1)) {
hashcpy(ref->old_oid.hash, sha1);
name += 41;
namelen -= 41;
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;
}

memcpy(ref->name, name, namelen);
Expand Down

0 comments on commit 854ecb9

Please sign in to comment.