From owner-svn-src-all@FreeBSD.ORG  Sun Feb 22 01:01:03 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 938493CD;
 Sun, 22 Feb 2015 01:01:03 +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 7E876E1;
 Sun, 22 Feb 2015 01:01:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1M113Il085157;
 Sun, 22 Feb 2015 01:01:03 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1M113pW085156;
 Sun, 22 Feb 2015 01:01:03 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201502220101.t1M113pW085156@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 22 Feb 2015 01:01:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279126 - head/usr.bin/mkimg
X-SVN-Group: head
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-1
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: Sun, 22 Feb 2015 01:01:03 -0000

Author: marcel
Date: Sun Feb 22 01:01:02 2015
New Revision: 279126
URL: https://svnweb.freebsd.org/changeset/base/279126

Log:
  In scheme_write(), don't overwrite the end parameter with the
  return value of image_get_size(). As it so happens, the only
  caller of scheme_write() passes exactly that.

Modified:
  head/usr.bin/mkimg/scheme.c

Modified: head/usr.bin/mkimg/scheme.c
==============================================================================
--- head/usr.bin/mkimg/scheme.c	Sun Feb 22 00:58:10 2015	(r279125)
+++ head/usr.bin/mkimg/scheme.c	Sun Feb 22 01:01:02 2015	(r279126)
@@ -180,7 +180,6 @@ scheme_write(lba_t end)
 {
 	int error;
 
-	end = image_get_size();
 	error = scheme->write(end, bootcode);
 	return (error);
 }