Commit 7b608b3b96d468427b2fbf2cad63988ed67be704
2011-06-26T17:57:40
git_blob_create_fromfile: remove old code Remove call of gitfo_size, since we call gitfo_lstat anyway; remove some old workaround code for gitfo_read, which is obsolete now. Signed-off-by: schu <schu-github@schulog.org>
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 43 44 45 46 47 48 49 50
diff --git a/src/blob.c b/src/blob.c
index d18aa5c..2e3c7b3 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -99,20 +99,12 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
}
islnk = S_ISLNK(st.st_mode);
+ size = st.st_size;
-
- if (!islnk) {
+ if (!islnk)
if ((fd = gitfo_open(full_path, O_RDONLY)) < 0)
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__throw(GIT_EOSERR, "Failed to create blob. '%s' appears to be corrupted", full_path);
- }
- } else {
- size = st.st_size;
- }
-
if ((error = git_odb_open_wstream(&stream, repo->db, (size_t)size, GIT_OBJ_BLOB)) < GIT_SUCCESS) {
if (!islnk)
gitfo_close(fd);
@@ -123,9 +115,9 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
ssize_t read_len;
if (!islnk)
- read_len = gitfo_read(fd, buffer, (size_t)(size < sizeof(buffer) ? size : sizeof(buffer)));
+ read_len = gitfo_read(fd, buffer, sizeof(buffer));
else
- read_len = gitfo_readlink(full_path, buffer, (size_t)size);
+ read_len = gitfo_readlink(full_path, buffer, sizeof(buffer));
if (read_len < 0) {
if (!islnk)
@@ -143,9 +135,6 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
if (!islnk)
gitfo_close(fd);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Failed to create blob");
-
- return GIT_SUCCESS;
+ return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to create blob");
}