From owner-svn-src-all@FreeBSD.ORG  Tue Jul 29 07:36:38 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ED705AFF;
 Tue, 29 Jul 2014 07:36:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA10C22AF;
 Tue, 29 Jul 2014 07:36:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T7acj3013543;
 Tue, 29 Jul 2014 07:36:38 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T7acBf013542;
 Tue, 29 Jul 2014 07:36:38 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201407290736.s6T7acBf013542@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 29 Jul 2014 07:36:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r269225 - stable/10/usr.bin/mkimg
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jul 2014 07:36:39 -0000

Author: pluknet
Date: Tue Jul 29 07:36:38 2014
New Revision: 269225
URL: http://svnweb.freebsd.org/changeset/base/269225

Log:
  MFC r268727 (by delphij):
  
  Add a bandaid to fix GCC build (on sparc64 et al).

Modified:
  stable/10/usr.bin/mkimg/vhd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/mkimg/vhd.c
==============================================================================
--- stable/10/usr.bin/mkimg/vhd.c	Tue Jul 29 07:13:03 2014	(r269224)
+++ stable/10/usr.bin/mkimg/vhd.c	Tue Jul 29 07:36:38 2014	(r269225)
@@ -320,6 +320,7 @@ vhd_dyn_write(int fd)
 
 	blk = 0;
 	blkcnt = VHD_BLOCK_SIZE / secsz;
+	error = 0;
 	nblks = image_get_size();
 	while (blk < nblks) {
 		if (!image_data(blk, blkcnt)) {