From 4ed80652d2eec8beefccdf4526ae3e71d65862fb Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 13 Apr 2012 17:08:38 +0200 Subject: [PATCH] * grub-core/fs/minix.c (grub_minix_data): Fix ino type. (grub_minix_read_file): Likewise. (grub_minix_read_inode): Likewise. (grub_minix_find_file): Likewise. (grub_minix_dir): Likewise. --- ChangeLog | 8 ++++++++ grub-core/fs/minix.c | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca35bd3fc..700fa38c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-04-13 Vladimir Serbinenko + + * grub-core/fs/minix.c (grub_minix_data): Fix ino type. + (grub_minix_read_file): Likewise. + (grub_minix_read_inode): Likewise. + (grub_minix_find_file): Likewise. + (grub_minix_dir): Likewise. + 2012-04-13 Vladimir Serbinenko * util/grub-setup.c (setup): Fix partition handling and blocklist diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c index a8d6372aa..dee29fc06 100644 --- a/grub-core/fs/minix.c +++ b/grub-core/fs/minix.c @@ -166,7 +166,7 @@ struct grub_minix_data { struct grub_minix_sblock sblock; struct grub_minix_inode inode; - int ino; + grub_minix_ino_t ino; int linknest; grub_disk_t disk; int filename_size; @@ -311,7 +311,7 @@ grub_minix_read_file (struct grub_minix_data *data, /* Read inode INO from the mounted filesystem described by DATA. This inode is used by default now. */ static grub_err_t -grub_minix_read_inode (struct grub_minix_data *data, int ino) +grub_minix_read_inode (struct grub_minix_data *data, grub_minix_ino_t ino) { struct grub_minix_sblock *sblock = &data->sblock; @@ -338,7 +338,7 @@ grub_minix_read_inode (struct grub_minix_data *data, int ino) /* Lookup the symlink the current inode points to. INO is the inode number of the directory the symlink is relative to. */ static grub_err_t -grub_minix_lookup_symlink (struct grub_minix_data *data, int ino) +grub_minix_lookup_symlink (struct grub_minix_data *data, grub_minix_ino_t ino) { char symlink[GRUB_MINIX_INODE_SIZE (data) + 1]; @@ -374,7 +374,7 @@ grub_minix_find_file (struct grub_minix_data *data, const char *path) char *name = fpath; char *next; unsigned int pos = 0; - int dirino; + grub_minix_ino_t dirino; grub_strcpy (fpath, path); @@ -550,7 +550,7 @@ grub_minix_dir (grub_device_t device, const char *path, { grub_minix_ino_t ino; char filename[data->filename_size + 1]; - int dirino = data->ino; + grub_minix_ino_t dirino = data->ino; struct grub_dirhook_info info; grub_memset (&info, 0, sizeof (info));