git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings

ramsay-jones · gitster · commit 73560c793a08 · 2017-09-22T13:00:33.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/git-compat-util.h b/git-compat-util.h
@@ -900,9 +900,11 @@ static inline char *xstrdup_or_null(const char *str)
 
 static inline size_t xsize_t(off_t len)
 {
-	if (len > (size_t) len)
+	size_t size = (size_t) len;
+
+	if (len != (off_t) size)
 		die("Cannot handle files this big");
-	return (size_t)len;
+	return size;
 }
 
 __attribute__((format (printf, 3, 4)))

Original file line number	Diff line number	Diff line change
`@@ -900,9 +900,11 @@ static inline char xstrdup_or_null(const char str)`
`900`	`900`
`901`	`901`	`static inline size_t xsize_t(off_t len)`
`902`	`902`	`{`
`903`		`- if (len > (size_t) len)`
	`903`	`+ size_t size = (size_t) len;`
	`904`	`+`
	`905`	`+ if (len != (off_t) size)`
`904`	`906`	`die("Cannot handle files this big");`
`905`		`- return (size_t)len;`
	`907`	`+ return size;`
`906`	`908`	`}`
`907`	`909`
`908`	`910`	`__attribute__((format (printf, 3, 4)))`