Merge pull request #4087 from tiennou/warnings

Fix a few recent warnings
This commit is contained in:
Edward Thomson 2017-01-23 13:29:14 +00:00 committed by GitHub
commit 1196807380
2 changed files with 3 additions and 2 deletions

View File

@ -381,7 +381,7 @@ GIT_EXTERN(int) git_treebuilder_write(
* *
* @see git_treebuilder_write * @see git_treebuilder_write
* *
* @param id Pointer to store the OID of the newly written tree * @param oid Pointer to store the OID of the newly written tree
* @param bld Tree builder to write * @param bld Tree builder to write
* @param tree Shared buffer for writing the tree. Will be grown as necessary. * @param tree Shared buffer for writing the tree. Will be grown as necessary.
* @return 0 or an error code * @return 0 or an error code

View File

@ -349,9 +349,10 @@ done:
static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cfg) static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cfg)
{ {
int error; int error;
git_iterator *i; git_iterator *i = NULL;
const git_index_entry *entry; const git_index_entry *entry;
git_strmap *names = 0; git_strmap *names = 0;
git_strmap_alloc(&names); git_strmap_alloc(&names);
if ((error = load_submodule_names(names, cfg))) if ((error = load_submodule_names(names, cfg)))
goto done; goto done;