diff options
| author | Martin Koegler <martin.koegler@chello.at> | 2017-08-10 20:13:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-10 14:45:02 -0700 |
| commit | c65861d8d17a4e1be0bb0f613c12f48b646837e4 (patch) | |
| tree | e7c0218142154ecd29fc1d7c12a2dd5f8f26ae1a /builtin/pack-objects.c | |
| parent | 4274c698f46a9bc45834c4904e7e113450c042fb (diff) | |
| download | git-mk/use-size-t-in-zlib.tar.gz | |
zlib.c: use size_t for sizemk/use-size-t-in-zlib
Signed-off-by: Martin Koegler <martin.koegler@chello.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f4a8441fe9..5c5d3d507a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -222,15 +222,15 @@ static void copy_pack_data(struct sha1file *f, struct packed_git *p, struct pack_window **w_curs, off_t offset, - off_t len) + size_t len) { unsigned char *in; - unsigned long avail; + size_t avail; while (len) { in = use_pack(p, w_curs, offset, &avail); if (avail > len) - avail = (unsigned long)len; + avail = len; sha1write(f, in, avail); offset += avail; len -= avail; @@ -1389,8 +1389,8 @@ static void check_object(struct object_entry *entry) struct pack_window *w_curs = NULL; const unsigned char *base_ref = NULL; struct object_entry *base_entry; - unsigned long used, used_0; - unsigned long avail; + size_t used, used_0; + size_t avail; off_t ofs; unsigned char *buf, c; |