diff options
| author | Elijah Newren <newren@gmail.com> | 2017-11-13 12:15:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 13:11:25 +0900 |
| commit | d6861d0258df95987696eab6c9bbc138a07190b9 (patch) | |
| tree | 7c90efa744c02bcc3f0a81b66ec529ec0870e165 /progress.h | |
| parent | sequencer: warn when internal merge may be suboptimal due to renameLimit (diff) | |
| download | git-d6861d0258df95987696eab6c9bbc138a07190b9.tar.gz git-d6861d0258df95987696eab6c9bbc138a07190b9.zip | |
progress: fix progress meters when dealing with lots of work
The possibility of setting merge.renameLimit beyond 2^16 raises the
possibility that the values passed to progress can exceed 2^32.
Use uint64_t, because it "ought to be enough for anybody". :-)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'progress.h')
| -rw-r--r-- | progress.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progress.h b/progress.h index 6392b63371..70a4d4a0d6 100644 --- a/progress.h +++ b/progress.h @@ -3,10 +3,10 @@ struct progress; -void display_throughput(struct progress *progress, off_t total); -int display_progress(struct progress *progress, unsigned n); -struct progress *start_progress(const char *title, unsigned total); -struct progress *start_delayed_progress(const char *title, unsigned total); +void display_throughput(struct progress *progress, uint64_t total); +int display_progress(struct progress *progress, uint64_t n); +struct progress *start_progress(const char *title, uint64_t total); +struct progress *start_delayed_progress(const char *title, uint64_t total); void stop_progress(struct progress **progress); void stop_progress_msg(struct progress **progress, const char *msg); |