diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:14:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:14:09 -0700 |
| commit | 44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc (patch) | |
| tree | e416edac27adfd1cf790f2aaa493b0e61a26d10f /index-pack.c | |
| parent | 037e9d5b1575d7ede05b50c317d9d88258556d84 (diff) | |
| parent | 48fb7deb5bbd87933e7d314b73d7c1b52667f80f (diff) | |
| download | git-44fb185963d42bb1dd6f1b3ea690d2a8f3c4edbc.tar.gz | |
Merge branch 'lt/maint-unsigned-left-shift' into maint
* lt/maint-unsigned-left-shift:
Fix big left-shifts of unsigned char
Diffstat (limited to 'index-pack.c')
| -rw-r--r-- | index-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/index-pack.c b/index-pack.c index 6e93ee6af6..0c92bafcbb 100644 --- a/index-pack.c +++ b/index-pack.c @@ -293,8 +293,8 @@ static void *unpack_entry_data(unsigned long offset, unsigned long size) static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_base) { - unsigned char *p, c; - unsigned long size; + unsigned char *p; + unsigned long size, c; off_t base_offset; unsigned shift; void *data; @@ -312,7 +312,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_ p = fill(1); c = *p; use(1); - size += (c & 0x7fUL) << shift; + size += (c & 0x7f) << shift; shift += 7; } obj->size = size; |