[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4A3FB479.2090902@lsrfire.ath.cx>
Date: Mon, 22 Jun 2009 18:42:33 +0200
From: René Scharfe <rene.scharfe@...fire.ath.cx>
To: roel kluin <roel.kluin@...il.com>
CC: Ingo Molnar <mingo@...e.hu>, git@...r.kernel.org,
LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Junio C Hamano <gitster@...ox.com>
Subject: [PATCH] fread does not return negative on error
Hi,
the following patch is for git. I just removed the unneeded check for
res == 0 from your version. Does it look OK?
Thanks,
René
--- snip! ---
From: Roel Kluin <roel.kluin@...il.com>
size_t res cannot be less than 0. fread returns 0 on error.
Reported-by: Ingo Molnar <mingo@...e.hu>
Signed-off-by: Roel Kluin <roel.kluin@...il.com>
---
strbuf.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/strbuf.c b/strbuf.c
index a884960..f03d117 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -260,7 +260,7 @@ size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
res = fread(sb->buf + sb->len, 1, size, f);
if (res > 0)
strbuf_setlen(sb, sb->len + res);
- else if (res < 0 && oldalloc == 0)
+ else if (oldalloc == 0)
strbuf_release(sb);
return res;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists