From owner-svn-src-user@FreeBSD.ORG  Sat Mar 29 04:05:57 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA42F93A;
 Sat, 29 Mar 2014 04:05:57 +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 A7D96EB1;
 Sat, 29 Mar 2014 04:05:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2T45vUI054789;
 Sat, 29 Mar 2014 04:05:57 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2T45vOE054788;
 Sat, 29 Mar 2014 04:05:57 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201403290405.s2T45vOE054788@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 29 Mar 2014 04:05:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r263898 - user/marcel/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Sat, 29 Mar 2014 04:05:57 -0000

Author: marcel
Date: Sat Mar 29 04:05:57 2014
New Revision: 263898
URL: http://svnweb.freebsd.org/changeset/base/263898

Log:
  Build this on sparc64, where we don't have LABELSECTOR nor LABELOFFSET
  defined. Improve portability by eliminating their use.

Modified:
  user/marcel/mkimg/bsd.c

Modified: user/marcel/mkimg/bsd.c
==============================================================================
--- user/marcel/mkimg/bsd.c	Sat Mar 29 03:55:58 2014	(r263897)
+++ user/marcel/mkimg/bsd.c	Sat Mar 29 04:05:57 2014	(r263898)
@@ -71,14 +71,14 @@ bsd_write(int fd, lba_t imgsz, void *boo
 		return (ENOMEM);
 	if (bootcode != NULL) {
 		memcpy(buf, bootcode, BBSIZE);
-		memset(buf + LABELSECTOR * secsz, 0, secsz);
+		memset(buf + secsz, 0, secsz);
 	} else
 		memset(buf, 0, BBSIZE);
 
 	imgsz = ncyls * nheads * nsecs;
 	ftruncate(fd, imgsz * secsz);
 
-	d = (void *)(buf + LABELSECTOR * secsz + LABELOFFSET);
+	d = (void *)(buf + secsz);
 	le32enc(&d->d_magic, DISKMAGIC);
 	le32enc(&d->d_secsize, secsz);
 	le32enc(&d->d_nsectors, nsecs);