diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/iterator.c | 5 | ||||
| -rw-r--r-- | src/odb.c | 2 | ||||
| -rw-r--r-- | src/openssl_stream.c | 1 | ||||
| -rw-r--r-- | src/stash.c | 3 | ||||
| -rw-r--r-- | src/submodule.c | 2 |
5 files changed, 4 insertions, 9 deletions
diff --git a/src/iterator.c b/src/iterator.c index 949949388..2c3a87af0 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -1852,7 +1852,6 @@ int git_iterator_walk( const git_index_entry **iterator_item; /* next in each iterator */ const git_index_entry **cur_items; /* current path in each iter */ const git_index_entry *first_match; - int cur_item_modified; size_t i, j; int error = 0; @@ -1875,7 +1874,6 @@ int git_iterator_walk( cur_items[i] = NULL; first_match = NULL; - cur_item_modified = 0; /* Find the next path(s) to consume from each iterator */ for (i = 0; i < cnt; i++) { @@ -1898,9 +1896,6 @@ int git_iterator_walk( first_match = iterator_item[i]; cur_items[i] = iterator_item[i]; - } else if (path_diff > 0) { - /* No entry for the current item, this is modified */ - cur_item_modified = 1; } else if (path_diff == 0) { cur_items[i] = iterator_item[i]; } @@ -53,7 +53,7 @@ static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_ int git_odb__format_object_header(char *hdr, size_t n, git_off_t obj_len, git_otype obj_type) { const char *type_str = git_object_type2string(obj_type); - int len = p_snprintf(hdr, n, "%s %lld", type_str, obj_len); + int len = p_snprintf(hdr, n, "%s %lld", type_str, (long long)obj_len); assert(len > 0 && len <= (int)n); return len+1; } diff --git a/src/openssl_stream.c b/src/openssl_stream.c index 90af4ae6e..958252e9f 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -413,6 +413,7 @@ void openssl_free(git_stream *stream) { openssl_stream *st = (openssl_stream *) stream; + git__free(st->host); git__free(st->cert_info.data); git_stream_free(st->io); git__free(st); diff --git a/src/stash.c b/src/stash.c index 59ecd3b07..acf89442a 100644 --- a/src/stash.c +++ b/src/stash.c @@ -793,7 +793,6 @@ static int stage_new_file(const git_index_entry **entries, void *data) static int stage_new_files( git_index **out, - git_repository *repo, git_tree *parent_tree, git_tree *tree) { @@ -886,7 +885,7 @@ int git_stash_apply( */ } else if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) == 0) { if ((error = stage_new_files( - &stash_adds, repo, stash_parent_tree, stash_tree)) < 0 || + &stash_adds, stash_parent_tree, stash_tree)) < 0 || (error = merge_indexes( &unstashed_index, repo, stash_parent_tree, repo_index, stash_adds)) < 0) goto cleanup; diff --git a/src/submodule.c b/src/submodule.c index 0cd6bb913..17e1a3561 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -749,7 +749,7 @@ const char *git_submodule_update_to_str(git_submodule_update_t update) { int i; for (i = 0; i < (int)ARRAY_SIZE(_sm_update_map); ++i) - if (_sm_update_map[i].map_value == update) + if (_sm_update_map[i].map_value == (int)update) return _sm_update_map[i].str_match; return NULL; } |