summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-29 02:23:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-29 02:23:42 (GMT)
commit14a8168e2fed3934f1f9afb286f1c64345d06790 (patch)
treefc622bb0da0f89762a03bf6bb17b3bdc66e7eb92 /git-compat-util.h
parentd4d262d19e118faf29df842b752144da7c7af02e (diff)
parent071bcaab6480dea80a47f574f61dc2cd9518e7dc (diff)
downloadgit-14a8168e2fed3934f1f9afb286f1c64345d06790.zip
git-14a8168e2fed3934f1f9afb286f1c64345d06790.tar.gz
git-14a8168e2fed3934f1f9afb286f1c64345d06790.tar.bz2
Merge branch 'rj/no-sign-compare'
Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 9bc15b0..cedad4d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -898,9 +898,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)))