diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-12-22 18:42:03 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-12-22 18:42:03 -0600 |
| commit | 2fe8157e1b603e0353fd991f3d129b49d35bed99 (patch) | |
| tree | f405ae0cf29a8efcc71533d55d4e95dc1bce1308 | |
| parent | 0bb237ed89a6700a1b6b884444ff044fd1467535 (diff) | |
| download | libgit2-2fe8157e1b603e0353fd991f3d129b49d35bed99.tar.gz | |
index: reuc and name entrycounts should be size_t
For the REUC and NAME entries, we use size_t internally, and we take
size_t for the get_byindex() functions, but the entrycount() functions
strangely cast to an unsigned int instead.
| -rw-r--r-- | include/git2/sys/index.h | 4 | ||||
| -rw-r--r-- | src/index.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/git2/sys/index.h b/include/git2/sys/index.h index 1a06a4df1..29a99f798 100644 --- a/include/git2/sys/index.h +++ b/include/git2/sys/index.h @@ -42,7 +42,7 @@ typedef struct git_index_reuc_entry { * @param index an existing index object * @return integer of count of current filename conflict entries */ -GIT_EXTERN(unsigned int) git_index_name_entrycount(git_index *index); +GIT_EXTERN(size_t) git_index_name_entrycount(git_index *index); /** * Get a filename conflict entry from the index. @@ -90,7 +90,7 @@ GIT_EXTERN(void) git_index_name_clear(git_index *index); * @param index an existing index object * @return integer of count of current resolve undo entries */ -GIT_EXTERN(unsigned int) git_index_reuc_entrycount(git_index *index); +GIT_EXTERN(size_t) git_index_reuc_entrycount(git_index *index); /** * Finds the resolve undo entry that points to the given path in the Git diff --git a/src/index.c b/src/index.c index 2db7c8ea5..079b0cb65 100644 --- a/src/index.c +++ b/src/index.c @@ -1497,10 +1497,10 @@ void git_index_conflict_iterator_free(git_index_conflict_iterator *iterator) git__free(iterator); } -unsigned int git_index_name_entrycount(git_index *index) +size_t git_index_name_entrycount(git_index *index) { assert(index); - return (unsigned int)index->names.length; + return index->names.length; } const git_index_name_entry *git_index_name_get_byindex( @@ -1557,10 +1557,10 @@ void git_index_name_clear(git_index *index) git_vector_clear(&index->names); } -unsigned int git_index_reuc_entrycount(git_index *index) +size_t git_index_reuc_entrycount(git_index *index) { assert(index); - return (unsigned int)index->reuc.length; + return index->reuc.length; } static int index_reuc_insert( |