summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-03-23 17:16:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-24 06:50:50 (GMT)
commite4ca819abff48af8e4a10059c88b3b1533b9f994 (patch)
tree8eac07ff308aa6c1bf882c9fa010084ab76ae0ab /refs.c
parent98f85ff4b65b565bae0592ded494d67045cbd3bf (diff)
downloadgit-e4ca819abff48af8e4a10059c88b3b1533b9f994.zip
git-e4ca819abff48af8e4a10059c88b3b1533b9f994.tar.gz
git-e4ca819abff48af8e4a10059c88b3b1533b9f994.tar.bz2
refs.c: fix fread error handling
fread returns the number of items read, with no special error return. Commit 98f85ff (reflog: add for_each_reflog_ent_reverse() API - 2013-03-08) introduced a call to fread which checks for an error with "nread < 0" which is tautological since nread is unsigned. The correct check in this case (which tries to read a single item) is "nread != 1". Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 8e24060..aa79c93 100644
--- a/refs.c
+++ b/refs.c
@@ -2357,7 +2357,7 @@ int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void
return error("cannot seek back reflog for %s: %s",
refname, strerror(errno));
nread = fread(buf, cnt, 1, logfp);
- if (nread < 0)
+ if (nread != 1)
return error("cannot read %d bytes from reflog for %s: %s",
cnt, refname, strerror(errno));
pos -= cnt;