proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-07 06:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #277 from schu/sign-compare

Browse Source 
Fix warning: signed and unsigned type in cond expr
This commit is contained in:
Vicent Martí 2011-06-28 10:39:07 -07:00
commit 2fb520f19a
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/blob.c
View File

@ -99,20 +99,12 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
} }
islnk = S_ISLNK(st.st_mode); islnk = S_ISLNK(st.st_mode);
size = st.st_size;
if (!islnk)
if (!islnk) {
if ((fd = gitfo_open(full_path, O_RDONLY)) < 0) if ((fd = gitfo_open(full_path, O_RDONLY)) < 0)
return git__throw(GIT_ENOTFOUND, "Failed to create blob. Could not open '%s'", full_path); 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 ((error = git_odb_open_wstream(&stream, repo->db, (size_t)size, GIT_OBJ_BLOB)) < GIT_SUCCESS) {
if (!islnk) if (!islnk)
gitfo_close(fd); 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; ssize_t read_len;
if (!islnk) 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 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 (read_len < 0) {
if (!islnk) if (!islnk)
@ -143,9 +135,6 @@ int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *pat
if (!islnk) if (!islnk)
gitfo_close(fd); gitfo_close(fd);
if (error < GIT_SUCCESS) return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to create blob");
return git__rethrow(error, "Failed to create blob");
return GIT_SUCCESS;
} }