proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-30 19:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move tag.c to the new error handling

Browse Source 
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
This commit is contained in:
Carlos Martín Nieto 2011-05-10 18:56:44 +02:00
parent 5de24ec736
commit 44dc0d261b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tag.c
View File

@ -90,13 +90,13 @@ static int parse_tag_buffer(git_tag *tag, const char *buffer, const char *buffer
int error; int error;
if ((error = git__parse_oid(&tag->target, &buffer, buffer_end, "object ")) < 0) if ((error = git__parse_oid(&tag->target, &buffer, buffer_end, "object ")) < 0)
return error; return git__rethrow(error, "Failed to parse tag. Object field invalid");
if (buffer + 5 >= buffer_end) if (buffer + 5 >= buffer_end)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Object too short");
if (memcmp(buffer, "type ", 5) != 0) if (memcmp(buffer, "type ", 5) != 0)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Type field not found");
buffer += 5; buffer += 5;
tag->type = GIT_OBJ_BAD; tag->type = GIT_OBJ_BAD;
@ -105,7 +105,7 @@ static int parse_tag_buffer(git_tag *tag, const char *buffer, const char *buffer
size_t type_length = strlen(tag_types[i]); size_t type_length = strlen(tag_types[i]);
if (buffer + type_length >= buffer_end) if (buffer + type_length >= buffer_end)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Object too short");
if (memcmp(buffer, tag_types[i], type_length) == 0) { if (memcmp(buffer, tag_types[i], type_length) == 0) {
tag->type = i; tag->type = i;
@ -115,18 +115,19 @@ static int parse_tag_buffer(git_tag *tag, const char *buffer, const char *buffer
} }
if (tag->type == GIT_OBJ_BAD) if (tag->type == GIT_OBJ_BAD)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Invalid object type");
if (buffer + 4 >= buffer_end) if (buffer + 4 >= buffer_end)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Object too short");
if (memcmp(buffer, "tag ", 4) != 0) if (memcmp(buffer, "tag ", 4) != 0)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Tag field not found");
buffer += 4; buffer += 4;
search = memchr(buffer, '\n', buffer_end - buffer); search = memchr(buffer, '\n', buffer_end - buffer);
if (search == NULL) if (search == NULL)
return GIT_EOBJCORRUPTED; return git__throw(GIT_EOBJCORRUPTED, "Failed to parse tag. Object too short");
text_len = search - buffer; text_len = search - buffer;
@ -218,7 +219,7 @@ static int tag_create(
} }
if (!git_odb_exists(repo->db, target)) if (!git_odb_exists(repo->db, target))
return GIT_ENOTFOUND; return git__throw(GIT_ENOTFOUND, "Failed to create tag. Object to tag doesn't exist");
/* Try to find out what the type is */ /* Try to find out what the type is */
if (target_type == GIT_OBJ_ANY) { if (target_type == GIT_OBJ_ANY) {