From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1TxXVg-0005R5-ES for mharc-grub-devel@gnu.org; Tue, 22 Jan 2013 01:39:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxXVd-0005P3-UI for grub-devel@gnu.org; Tue, 22 Jan 2013 01:39:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxXVc-0002de-S7 for grub-devel@gnu.org; Tue, 22 Jan 2013 01:39:01 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:47891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxXVc-0002dT-KZ for grub-devel@gnu.org; Tue, 22 Jan 2013 01:39:00 -0500 Received: by mail-lb0-f181.google.com with SMTP id gm6so1021712lbb.40 for ; Mon, 21 Jan 2013 22:38:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:in-reply-to :references:x-mailer:mime-version:content-type :content-transfer-encoding; bh=f221eGujs1nmTRazW8xEFcnE8RMpkGkLD5lTlMYPfQ0=; b=s6IExIS14XFmqvpYK/zGjkMzxz6SFAmdsHeEs6ja/OvuJl2cD97Et3/o3l7YgexBUN vsa+j8JKnd9MFeRMWpIBYxfM4nAoZHhuztYjvx58ZLVPHjf1IRG5Zwkz+HjZI+/UkFsL oe7EOz1r7wlKOkMUTvgfy5kr0+kMDWGJN4JY9X9tC9IGnVxEWHcQE7gumycC98QFt2vj OzZuURQOLVHZTdnj+KsyT3FiA3GmJvu3az8NpjYYDuMIWud1N5H4kOeWPRBW5Gxp6XV6 0wI2/mRaSZCvm9bm58pA6775cCQAh4by+Ta0Sah7xJ4L31poyCGiN1lbaDWiIgkETmUw Q5Eg== X-Received: by 10.152.108.195 with SMTP id hm3mr20013250lab.17.1358836739024; Mon, 21 Jan 2013 22:38:59 -0800 (PST) Received: from opensuse.site (ppp91-78-198-46.pppoe.mtu-net.ru. [91.78.198.46]) by mx.google.com with ESMTPS id b3sm6438469lbl.0.2013.01.21.22.38.57 (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 21 Jan 2013 22:38:58 -0800 (PST) Date: Tue, 22 Jan 2013 10:38:55 +0400 From: Andrey Borzenkov To: The development of GNU GRUB Subject: Re: Enabling DragonFly BSD disklabel64 read support Message-ID: <20130122103855.5fd0a624@opensuse.site> In-Reply-To: References: X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.10; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.217.181 Cc: lavrin@gmail.com X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 06:39:03 -0000 ÷ Mon, 21 Jan 2013 22:17:16 +0100 > ---- > diff --git a/.gitignore b/.gitignore > new file mode 100644 > index 0000000..e107348 > --- /dev/null > +++ b/.gitignore As much as would welcome it - grub is using bzr as VCS, so it probably is not in place here. I suggest you add .gitignore to .gitignore :) > diff --git a/grub-core/partmap/apple.c b/grub-core/partmap/apple.c > index c08cae5..1c1d3bc 100644 > --- a/grub-core/partmap/apple.c > +++ b/grub-core/partmap/apple.c > @@ -118,7 +118,7 @@ apple_partition_map_iterate (grub_disk_t disk, > if (grub_be_to_cpu16 (aheader.magic) != GRUB_APPLE_HEADER_MAGIC) > { > grub_dprintf ("partition", > - "bad magic (found 0x%x; wanted 0x%x\n", > + "bad magic (found 0x%x; wanted 0x%x)\n", > grub_be_to_cpu16 (aheader.magic), > GRUB_APPLE_HEADER_MAGIC); > goto fail; > @@ -138,7 +138,7 @@ apple_partition_map_iterate (grub_disk_t disk, > if (grub_be_to_cpu16 (apart.magic) != GRUB_APPLE_PART_MAGIC) > { > grub_dprintf ("partition", > - "partition %d: bad magic (found 0x%x; wanted 0x%x\n", > + "partition %d: bad magic (found 0x%x; wanted 0x%x)\n", > partno, grub_be_to_cpu16 (apart.magic), > GRUB_APPLE_PART_MAGIC); > break; I would say this should go in separate clean up patch; I wonder if Vladimir accepts mixing several unrelated changes in one commit. > diff --git a/grub-core/partmap/dfly.c b/grub-core/partmap/dfly.c [...] > +static grub_err_t > +dfly_partition_map_iterate (grub_disk_t disk, > + int (*hook) (grub_disk_t disk, > + const grub_partition_t partition)) [...] > + > + if (hook (disk, &part)) You need to update it to new hook API (added third parameter).