* grub-core/commands/macbless.c (grub_mac_bless_inode): Pass inode as u32

as both HFS and HFS+ have 32-bit inodes.

diff --git a/ChangeLog b/ChangeLog
index 1f97624d6c991bfa46caea09b8886da3a5fe936d..38e5ddc323cece4640f6b0041bcc77c65bf8b203 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * 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  <phcoder@gmail.com>
 
        * include/grub/misc.h (grub_strtol): Fix overflow.

diff --git a/grub-core/commands/macbless.c b/grub-core/commands/macbless.c
index 38ca353a201f3c7ece8f0c346ccc6c130fcfb40b..c5210833ed0c2827143b339eab5205cef31709a3 100644 (file)
--- 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 75c9d18a33974321e65f4a6b6c28bc1e6dec6daa..8ba8f32468b697fbc613676efa492dc091596bc5 100644 (file)
--- 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);