On Tue, Mar 17, 2020 at 08:57:37AM +0100, Denis 'GNUtoo' Carikli wrote:
[snip]
> @@ -1041,7 +1043,7 @@ grub_cryptodisk_cheat_mount (const char *sourcedev,
> const char *cheat)
>
> FOR_CRYPTODISK_DEVS (cr)
> {
> - dev = cr->scan (source, search_uuid, check_boot);
> + dev = cr->scan (source, search_uuid, check_boot, 0);
The added argument is a pointer, right? In that case you should use
`NULL` instead of `0`.
> if (grub_errno)
> return grub_errno;
> if (!dev)
[snip]
> @@ -52,6 +52,7 @@
> #include <grub/dl.h>
> #include <grub/err.h>
> #include <grub/disk.h>
> +#include <grub/file.h>
> #include <grub/crypto.h>
> #include <grub/partition.h>
> #include <grub/i18n.h>
> @@ -242,7 +243,8 @@ grub_util_get_geli_uuid (const char *dev)
> #endif
>
> static grub_cryptodisk_t
> -geli_scan (grub_disk_t disk, const char *check_uuid, int boot_only)
> +geli_scan (grub_disk_t disk, const char *check_uuid, int boot_only,
> + grub_file_t hdr __attribute__((__unused__)))
> {
> grub_cryptodisk_t newdev;
> struct grub_geli_phdr header;
> @@ -254,6 +256,7 @@ geli_scan (grub_disk_t disk, const char *check_uuid, int
> boot_only)
> grub_disk_addr_t sector;
> grub_err_t err;
>
> +
This added newline looks like an accidental change.
Patrick
signature.asc
Description: PGP signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
