Merge branch 'maint-1.6.2' into maint-1.6.3

[git.git] / base85.c

diff --git a/base85.c b/base85.c
index 24ddf60eb0a20f35efcdc2d37f99e46d94e8f5c9..e459feebbf90c6557dbf3ff913f83a57a8afb210 100644 (file)
--- a/base85.c
+++ b/base85.c
@@ -83,7 +83,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;