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

… u32 as both HFS and HFS+ have 32-bit inodes.
ikozhukhov · Dec 21, 2013 · ab21651 · ab21651
1 parent 0d4aa91
commit ab21651
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Vladimir Serbinenko  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* include/grub/misc.h (grub_strtol): Fix overflow.

diff --git 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
@@ -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);