2009-05-05 Pavel Roskin <proski@gnu.org>
* include/grub/dl.h [GRUB_UTIL]: Provide inline implementations of grub_dl_ref() and grub_dl_unref(). * commands/parttool.c: Remove preprocessor conditionals around grub_dl_ref() and grub_dl_unref(). * fs/affs.c: Likewise. * fs/afs.c: Likewise. * fs/cpio.c: Likewise. * fs/ext2.c: Likewise. * fs/fat.c: Likewise. * fs/hfs.c: Likewise. * fs/hfsplus.c: Likewise. * fs/iso9660.c: Likewise. * fs/jfs.c: Likewise. * fs/minix.c: Likewise. * fs/ntfs.c: Likewise. * fs/reiserfs.c: Likewise. * fs/sfs.c: Likewise. * fs/udf.c: Likewise. * fs/ufs.c: Likewise. * fs/xfs.c: Likewise. * include/grub/dl.h: Likewise. * loader/xnu.c: Likewise.
This commit is contained in:
parent
de5fd76e95
commit
119494b506
20 changed files with 41 additions and 282 deletions
14
fs/udf.c
14
fs/udf.c
|
@ -356,9 +356,7 @@ struct grub_fshelp_node
|
|||
int part_ref;
|
||||
};
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
static grub_dl_t my_mod;
|
||||
#endif
|
||||
|
||||
static grub_uint32_t
|
||||
grub_udf_get_block (struct grub_udf_data *data,
|
||||
|
@ -790,9 +788,7 @@ grub_udf_dir (grub_device_t device, const char *path,
|
|||
return hook (filename, &info);
|
||||
}
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_udf_mount (device->disk);
|
||||
if (!data)
|
||||
|
@ -814,9 +810,7 @@ grub_udf_dir (grub_device_t device, const char *path,
|
|||
fail:
|
||||
grub_free (data);
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
@ -828,9 +822,7 @@ grub_udf_open (struct grub_file *file, const char *name)
|
|||
struct grub_fshelp_node rootnode;
|
||||
struct grub_fshelp_node *foundnode;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_udf_mount (file->device->disk);
|
||||
if (!data)
|
||||
|
@ -851,9 +843,7 @@ grub_udf_open (struct grub_file *file, const char *name)
|
|||
return 0;
|
||||
|
||||
fail:
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
grub_free (data);
|
||||
|
||||
|
@ -879,9 +869,7 @@ grub_udf_close (grub_file_t file)
|
|||
grub_free (node);
|
||||
}
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
@ -916,9 +904,7 @@ static struct grub_fs grub_udf_fs = {
|
|||
GRUB_MOD_INIT (udf)
|
||||
{
|
||||
grub_fs_register (&grub_udf_fs);
|
||||
#ifndef GRUB_UTIL
|
||||
my_mod = mod;
|
||||
#endif
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI (udf)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue