From owner-svn-src-user@FreeBSD.ORG  Sun Jan 23 18:41:17 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B9691065670;
	Sun, 23 Jan 2011 18:41:17 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0AF228FC12;
	Sun, 23 Jan 2011 18:41:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0NIfG4s064029;
	Sun, 23 Jan 2011 18:41:16 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0NIfGSY064026;
	Sun, 23 Jan 2011 18:41:16 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101231841.p0NIfGSY064026@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 23 Jan 2011 18:41:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217758 - user/nwhitehorn/bsdinstall/distfetch
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Jan 2011 18:41:17 -0000

Author: nwhitehorn
Date: Sun Jan 23 18:41:16 2011
New Revision: 217758
URL: http://svn.freebsd.org/changeset/base/217758

Log:
  Avoid wraparound in progress bars on systems with 32-bit size_t.

Modified:
  user/nwhitehorn/bsdinstall/distfetch/distfetch.c

Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c
==============================================================================
--- user/nwhitehorn/bsdinstall/distfetch/distfetch.c	Sun Jan 23 18:23:19 2011	(r217757)
+++ user/nwhitehorn/bsdinstall/distfetch/distfetch.c	Sun Jan 23 18:41:16 2011	(r217758)
@@ -41,11 +41,11 @@ fetch_files(int nfiles, char **urls)
 	const char **items;
 	FILE *fetch_out, *file_out;
 	struct url_stat ustat;
-	off_t total_bytes, current_bytes;
+	off_t total_bytes, current_bytes, fsize;
 	char status[8];
 	char errormsg[512];
 	uint8_t block[4096];
-	size_t chunk, fsize;
+	size_t chunk;
 	int i, progress, last_progress;
 	int nsuccess = 0; /* Number of files successfully downloaded */