blob.c: Move to new error handling mechanism
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/src/blob.c b/src/blob.c
index 9871693..0cc9b2a 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -69,6 +69,8 @@ int git_blob_create_frombuffer(git_oid *oid, git_repository *repo, const void *b
error = stream->finalize_write(oid, stream);
stream->free(stream);
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create blob");
return error;
}
@@ -86,16 +88,16 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
git__joinpath(full_path, repo->path_workdir, path);
if ((fd = gitfo_open(full_path, O_RDONLY)) < 0)
- return GIT_ENOTFOUND;
+ return git__throw(GIT_ENOTFOUND, "Failed to create blob. Could not open %s", full_path);
if ((size = gitfo_size(fd)) < 0 || !git__is_sizet(size)) {
gitfo_close(fd);
- return GIT_EOSERR;
+ return git__throw(GIT_EOSERR, "Failed to create blob. %s appears to be corrupted", full_path);
}
if ((error = git_odb_open_wstream(&stream, repo->db, (size_t)size, GIT_OBJ_BLOB)) < GIT_SUCCESS) {
gitfo_close(fd);
- return error;
+ return git__rethrow(error, "Failed to create blob");
}
while (size > 0) {
@@ -117,6 +119,8 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
stream->free(stream);
gitfo_close(fd);
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create blob");
return error;
}