From ab216512d74e760ad5713f6366bd46bf081ec5d0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 21 Dec 2013 14:40:53 +0100 Subject: [PATCH] * grub-core/commands/macbless.c (grub_mac_bless_inode): Pass inode as u32 as both HFS and HFS+ have 32-bit inodes. --- ChangeLog | 5 +++++ grub-core/commands/macbless.c | 6 +++--- include/grub/hfsplus.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f97624d6..38e5ddc32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-12-21 Vladimir Serbinenko + + * grub-core/commands/macbless.c (grub_mac_bless_inode): Pass inode as + u32 as both HFS and HFS+ have 32-bit inodes. + 2013-12-21 Vladimir Serbinenko * include/grub/misc.h (grub_strtol): Fix overflow. diff --git a/grub-core/commands/macbless.c b/grub-core/commands/macbless.c index 38ca353a2..c5210833e 100644 --- a/grub-core/commands/macbless.c +++ b/grub-core/commands/macbless.c @@ -59,7 +59,7 @@ find_inode (const char *filename, } grub_err_t -grub_mac_bless_inode (grub_device_t dev, grub_uint64_t inode, int is_dir, +grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir, int intel) { grub_err_t err; @@ -174,8 +174,8 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel) } grub_free (path); - return grub_mac_bless_inode (dev, ctx.inode_found, (ctx.found == DIR), - intel); + return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found, + (ctx.found == DIR), intel); } static grub_err_t diff --git a/include/grub/hfsplus.h b/include/grub/hfsplus.h index 75c9d18a3..8ba8f3246 100644 --- a/include/grub/hfsplus.h +++ b/include/grub/hfsplus.h @@ -247,7 +247,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree, struct grub_hfsplus_btnode **matchnode, grub_off_t *keyoffset); grub_err_t -grub_mac_bless_inode (grub_device_t dev, grub_uint64_t inode, int is_dir, +grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir, int intel); grub_err_t grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel);