From: Anders Björklund <anders@psqr.se>
Date: Sun, 13 Nov 2016 15:52:55 +0000 (+0100)
Subject: Undefined: avoid shift warning in manifest
X-Git-Tag: v3.3.4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62128c135427193ba09f84508bce039231d88c67;p=thirdparty%2Fccache.git

Undefined: avoid shift warning in manifest

manifest.c:264:46: runtime error: left shift of 72057594037927935 by 8 places cannot be represented in type 'long int'
---

diff --git a/manifest.c b/manifest.c
index 28ee35d5d..7c019e183 100644
--- a/manifest.c
+++ b/manifest.c
@@ -165,15 +165,16 @@ free_manifest(struct manifest *mf)
 
 #define READ_INT(size, var) \
   do { \
-		(var) = 0; \
+		uint64_t u_ = 0; \
 		for (size_t i_ = 0; i_ < (size); i_++) { \
 			int ch_ = gzgetc(f); \
 			if (ch_ == EOF) { \
 				goto error; \
 			} \
-			(var) <<= 8; \
-			(var) |= ch_ & 0xFF; \
+			u_ <<= 8; \
+			u_ |= ch_ & 0xFF; \
 		} \
+		(var) = u_; \
 	} while (false)
 
 #define READ_STR(var) \
@@ -289,10 +290,11 @@ error:
 
 #define WRITE_INT(size, var) \
   do { \
+		uint64_t u_ = (var); \
 		uint8_t ch_; \
 		size_t i_; \
 		for (i_ = 0; i_ < (size); i_++) { \
-			ch_ = ((var) >> (8 * ((size) - i_ - 1))); \
+			ch_ = (u_ >> (8 * ((size) - i_ - 1))); \
 			if (gzputc(f, ch_) == EOF) { \
 				goto error; \
 			} \