From: Ramsay Jones <ramsay@ramsayjones.plus.com>
Date: Thu, 21 Sep 2017 16:46:24 +0000 (+0100)
Subject: git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings
X-Git-Tag: v2.15.0-rc0~30^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73560c793a08b389cc8ad5930db2cebb858affcb;p=thirdparty%2Fgit.git

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

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-compat-util.h b/git-compat-util.h
index 7d2c0ca759..bf4869dcef 100644
--- 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)))