proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 12:24:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: reuc and name entrycounts should be size_t

Browse Source 
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.
This commit is contained in:
Edward Thomson 2014-12-22 18:42:03 -06:00
parent 0bb237ed89
commit 2fe8157e1b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git2/sys/index.h
View File

@ -42,7 +42,7 @@ typedef struct git_index_reuc_entry {
* @param index an existing index object * @param index an existing index object
* @return integer of count of current filename conflict entries * @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. * 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 * @param index an existing index object
* @return integer of count of current resolve undo entries * @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 * Finds the resolve undo entry that points to the given path in the Git

8
src/index.c
View File

@ -1497,10 +1497,10 @@ void git_index_conflict_iterator_free(git_index_conflict_iterator *iterator)
git__free(iterator); git__free(iterator);
} }
unsigned int git_index_name_entrycount(git_index *index) size_t git_index_name_entrycount(git_index *index)
{ {
assert(index); assert(index);
return (unsigned int)index->names.length; return index->names.length;
} }
const git_index_name_entry *git_index_name_get_byindex( 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); 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); assert(index);
return (unsigned int)index->reuc.length; return index->reuc.length;
} }
static int index_reuc_insert( static int index_reuc_insert(