cache.h: hex2chr() - avoid -Wsign-compare warnings

ramsay-jones · gitster · commit 356a293f39e1 · 2017-09-22T13:00:38.000+09:00
Signed-off-by: Ramsay Jones &lt;ramsay@ramsayjones.plus.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -1264,8 +1264,8 @@ static inline unsigned int hexval(unsigned char c)
  */
 static inline int hex2chr(const char *s)
 {
-	int val = hexval(s[0]);
-	return (val < 0) ? val : (val << 4) | hexval(s[1]);
+	unsigned int val = hexval(s[0]);
+	return (val & ~0xf) ? val : (val << 4) | hexval(s[1]);
 }
 
 /* Convert to/from hex/sha1 representation */

Original file line number	Diff line number	Diff line change
`@@ -1264,8 +1264,8 @@ static inline unsigned int hexval(unsigned char c)`
`1264`	`1264`	`*/`
`1265`	`1265`	`static inline int hex2chr(const char *s)`
`1266`	`1266`	`{`
`1267`		`- int val = hexval(s[0]);`
`1268`		`- return (val < 0) ? val : (val << 4) \| hexval(s[1]);`
	`1267`	`+ unsigned int val = hexval(s[0]);`
	`1268`	`+ return (val & ~0xf) ? val : (val << 4) \| hexval(s[1]);`
`1269`	`1269`	`}`
`1270`	`1270`
`1271`	`1271`	`/* Convert to/from hex/sha1 representation */`