diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/blob.c | 2 | ||||
| -rw-r--r-- | src/odb.c | 2 | ||||
| -rw-r--r-- | src/odb_pack.c | 6 | ||||
| -rw-r--r-- | src/revwalk.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/blob.c b/src/blob.c index a5a0b6dde..6137746e1 100644 --- a/src/blob.c +++ b/src/blob.c @@ -68,7 +68,7 @@ static int write_file_stream( int fd, error; char buffer[4096]; git_odb_stream *stream = NULL; - ssize_t read_len, written = 0; + ssize_t read_len = -1, written = 0; if ((error = git_odb_open_wstream( &stream, odb, (size_t)file_size, GIT_OBJ_BLOB)) < 0) @@ -115,7 +115,7 @@ int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type) int hdr_len; char hdr[64], buffer[2048]; git_hash_ctx *ctx; - ssize_t read_len; + ssize_t read_len = -1; if (!git_object_typeisloose(type)) { giterr_set(GITERR_INVALID, "Invalid object type for hash"); diff --git a/src/odb_pack.c b/src/odb_pack.c index 6e3d3eefd..d33d06456 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -268,13 +268,13 @@ static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backen int error; unsigned int i; - if ((error = packfile_refresh_all(backend)) < 0) - return error; - if (backend->last_found && git_pack_entry_find(e, backend->last_found, oid, GIT_OID_HEXSZ) == 0) return 0; + if ((error = packfile_refresh_all(backend)) < 0) + return error; + for (i = 0; i < backend->packs.length; ++i) { struct git_pack_file *p; diff --git a/src/revwalk.c b/src/revwalk.c index 1a0927719..8141d177b 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -419,7 +419,7 @@ cleanup: return error; } -int git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two) +int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two) { git_revwalk *walk; git_vector list; |