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

tag: convert parse_tag_buffer to struct object_id

Browse Source 
Specify some constants in terms of GIT_SHA1_HEXSZ, and convert a
get_sha1_hex into parse_oid_hex to avoid needing to specify additional
constants.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2017-05-06 22:10:02 +00:00 committed by Junio C Hamano
parent eee886cfb0
commit 1e4085a05d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tag.c
View File

@ -116,7 +116,7 @@ static unsigned long parse_tag_date(const char *buf, const char *tail)
int parse_tag_buffer(struct tag *item, const void *data, unsigned long size) int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
{ {
unsigned char sha1[20]; struct object_id oid;
char type[20]; char type[20];
const char *bufptr = data; const char *bufptr = data;
const char *tail = bufptr + size; const char *tail = bufptr + size;
@ -126,11 +126,10 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
return 0; return 0;
item->object.parsed = 1; item->object.parsed = 1;
if (size < 64) if (size < GIT_SHA1_HEXSZ + 24)
return -1; return -1;
if (memcmp("object ", bufptr, 7) || get_sha1_hex(bufptr + 7, sha1) || bufptr[47] != '\n') if (memcmp("object ", bufptr, 7) || parse_oid_hex(bufptr + 7, &oid, &bufptr) || *bufptr++ != '\n')
return -1; return -1;
bufptr += 48; /* "object " + sha1 + "\n" */
if (!starts_with(bufptr, "type ")) if (!starts_with(bufptr, "type "))
return -1; return -1;
@ -143,13 +142,13 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
bufptr = nl + 1; bufptr = nl + 1;
if (!strcmp(type, blob_type)) { if (!strcmp(type, blob_type)) {
item->tagged = &lookup_blob(sha1)->object; item->tagged = &lookup_blob(oid.hash)->object;
} else if (!strcmp(type, tree_type)) { } else if (!strcmp(type, tree_type)) {
item->tagged = &lookup_tree(sha1)->object; item->tagged = &lookup_tree(oid.hash)->object;
} else if (!strcmp(type, commit_type)) { } else if (!strcmp(type, commit_type)) {
item->tagged = &lookup_commit(sha1)->object; item->tagged = &lookup_commit(oid.hash)->object;
} else if (!strcmp(type, tag_type)) { } else if (!strcmp(type, tag_type)) {
item->tagged = &lookup_tag(sha1)->object; item->tagged = &lookup_tag(oid.hash)->object;
} else { } else {
error("Unknown type %s", type); error("Unknown type %s", type);
item->tagged = NULL; item->tagged = NULL;