diff options
| author | Edward Thomson <ethomson@github.com> | 2016-07-15 17:18:39 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-07-24 15:49:19 -0400 |
| commit | 60e15ecd5518f26fa2d18cca9ab22b248596e68c (patch) | |
| tree | afba770a24818de0e30a1b113e0bbb88d26c6ba4 /include/git2 | |
| parent | 581a4d3942ae5a66933632530fccd65f93ac5e4b (diff) | |
| download | libgit2-60e15ecd5518f26fa2d18cca9ab22b248596e68c.tar.gz | |
packbuilder: `size_t` all the things
After 1cd65991, we were passing a pointer to an `unsigned long` to
a function that now expected a pointer to a `size_t`. These types
differ on 64-bit Windows, which means that we trash the stack.
Use `size_t`s in the packbuilder to avoid this.
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/pack.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/git2/pack.h b/include/git2/pack.h index 4941998eb..2dfd825e9 100644 --- a/include/git2/pack.h +++ b/include/git2/pack.h @@ -196,7 +196,7 @@ GIT_EXTERN(int) git_packbuilder_foreach(git_packbuilder *pb, git_packbuilder_for * @param pb the packbuilder * @return the number of objects in the packfile */ -GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); +GIT_EXTERN(size_t) git_packbuilder_object_count(git_packbuilder *pb); /** * Get the number of objects the packbuilder has already written out @@ -204,13 +204,13 @@ GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); * @param pb the packbuilder * @return the number of objects which have already been written */ -GIT_EXTERN(uint32_t) git_packbuilder_written(git_packbuilder *pb); +GIT_EXTERN(size_t) git_packbuilder_written(git_packbuilder *pb); /** Packbuilder progress notification function */ typedef int (*git_packbuilder_progress)( int stage, - unsigned int current, - unsigned int total, + uint32_t current, + uint32_t total, void *payload); /** |