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/jfs.c
14
fs/jfs.c
|
@ -229,9 +229,7 @@ struct grub_jfs_diropen
|
|||
} __attribute__ ((packed));
|
||||
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
static grub_dl_t my_mod;
|
||||
#endif
|
||||
|
||||
static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, int ino);
|
||||
|
||||
|
@ -734,9 +732,7 @@ grub_jfs_dir (grub_device_t device, const char *path,
|
|||
struct grub_jfs_data *data = 0;
|
||||
struct grub_jfs_diropen *diro = 0;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_jfs_mount (device->disk);
|
||||
if (!data)
|
||||
|
@ -773,9 +769,7 @@ grub_jfs_dir (grub_device_t device, const char *path,
|
|||
grub_jfs_closedir (diro);
|
||||
grub_free (data);
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
@ -787,9 +781,7 @@ grub_jfs_open (struct grub_file *file, const char *name)
|
|||
{
|
||||
struct grub_jfs_data *data;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_jfs_mount (file->device->disk);
|
||||
if (!data)
|
||||
|
@ -814,9 +806,7 @@ grub_jfs_open (struct grub_file *file, const char *name)
|
|||
|
||||
fail:
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
grub_free (data);
|
||||
|
||||
|
@ -839,9 +829,7 @@ grub_jfs_close (grub_file_t file)
|
|||
{
|
||||
grub_free (file->data);
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
@ -876,9 +864,7 @@ static struct grub_fs grub_jfs_fs =
|
|||
GRUB_MOD_INIT(jfs)
|
||||
{
|
||||
grub_fs_register (&grub_jfs_fs);
|
||||
#ifndef GRUB_UTIL
|
||||
my_mod = mod;
|
||||
#endif
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(jfs)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue