From 86330a74176f0ad0e8cec096801b909928d55bba Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 9 May 2009 19:14:40 +0000 Subject: Address some implicit sign casts. Bump to 1.5. --- net/fetch/Makefile | 4 ++-- net/fetch/files/fetch.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/fetch/Makefile b/net/fetch/Makefile index 393e3677d25..c55490f6ad5 100644 --- a/net/fetch/Makefile +++ b/net/fetch/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2009/02/09 13:34:51 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2009/05/09 19:14:40 joerg Exp $ # -DISTNAME= fetch-1.4 +DISTNAME= fetch-1.5 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/fetch/files/fetch.c b/net/fetch/files/fetch.c index dea2e0292c3..34bf7a1ffcb 100644 --- a/net/fetch/files/fetch.c +++ b/net/fetch/files/fetch.c @@ -344,6 +344,7 @@ fetch(char *URL, const char *path) FILE *of; fetchIO *f; size_t size, wr; + ssize_t ssize; off_t count; char flags[8]; char *tmppath; @@ -656,12 +657,13 @@ fetch(char *URL, const char *path) stat_display(&xs, 1); siginfo = 0; } - if ((size = fetchIO_read(f, buf, B_size)) == 0) + if ((ssize = fetchIO_read(f, buf, B_size)) == 0) break; - if (size == -1 && errno == EINTR) + if (ssize == -1 && errno == EINTR) continue; - if (size == -1) + if (ssize == -1) break; + size = ssize; stat_update(&xs, count += size); for (ptr = buf; size > 0; ptr += wr, size -= wr) { if ((wr = fwrite(ptr, 1, size, of)) < size) { -- cgit v1.2.3