aboutsummaryrefslogtreecommitdiffstats
path: root/base85.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-20 21:46:10 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-20 21:46:10 -0700
commit7c74c3926ad60ba1bbfed13355f00a29813a0f32 (patch)
tree45d5169b6377988e617a9d1a2096b98f31d07a49 /base85.c
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
parentFix big left-shifts of unsigned char (diff)
downloadgit-7c74c3926ad60ba1bbfed13355f00a29813a0f32.tar.gz
git-7c74c3926ad60ba1bbfed13355f00a29813a0f32.zip
Merge branch 'lt/maint-unsigned-left-shift'
* lt/maint-unsigned-left-shift: Fix big left-shifts of unsigned char
Diffstat (limited to 'base85.c')
-rw-r--r--base85.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/base85.c b/base85.c
index b88270f908..b417a15bbc 100644
--- a/base85.c
+++ b/base85.c
@@ -91,7 +91,7 @@ void encode_85(char *buf, const unsigned char *data, int bytes)
unsigned acc = 0;
int cnt;
for (cnt = 24; cnt >= 0; cnt -= 8) {
- int ch = *data++;
+ unsigned ch = *data++;
acc |= ch << cnt;
if (--bytes == 0)
break;