Commit 60e1b49a by Vicent Marti

odb_loose: Reword errors

parent dfb12cd5
...@@ -452,7 +452,11 @@ static int read_header_loose(git_rawobj *out, const char *loc) ...@@ -452,7 +452,11 @@ static int read_header_loose(git_rawobj *out, const char *loc)
cleanup: cleanup:
finish_inflate(&zs); finish_inflate(&zs);
gitfo_close(fd); gitfo_close(fd);
return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to read loose object header");
if (error < GIT_SUCCESS)
return git__throw(error, "Failed to read loose object header. Header is corrupted");
return GIT_SUCCESS;
} }
static int locate_object(char *object_location, loose_backend *backend, const git_oid *oid) static int locate_object(char *object_location, loose_backend *backend, const git_oid *oid)
...@@ -485,11 +489,14 @@ int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend ...@@ -485,11 +489,14 @@ int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend
assert(backend && oid); assert(backend && oid);
raw.len = 0;
raw.type = GIT_OBJ_BAD;
if (locate_object(object_path, (loose_backend *)backend, oid) < 0) if (locate_object(object_path, (loose_backend *)backend, oid) < 0)
return git__throw(GIT_ENOTFOUND, "Failed to read loose backend header. Object not found"); return git__throw(GIT_ENOTFOUND, "Failed to read loose backend header. Object not found");
if ((error = read_header_loose(&raw, object_path)) < GIT_SUCCESS) if ((error = read_header_loose(&raw, object_path)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to read loose backend header"); return error;
*len_p = raw.len; *len_p = raw.len;
*type_p = raw.type; *type_p = raw.type;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment