Re: Enabling DragonFly BSD disklabel64 read support

[Andrey Borzenkov]

В 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).