mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-23 07:39:22 +00:00
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:
1 parent
de5fd76e95
commit
119494b506
20 files changed
+41
-282
No files matched your search
@@ -226,9 +226,7 @@ struct grub_hfsplus_data
|
||||
int embedded_offset;
|
||||
};
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
static grub_dl_t my_mod;
|
||||
#endif
|
||||
|
||||
|
||||
/* Return the offset of the record with the index INDEX, in the node
|
||||
@@ -827,9 +825,7 @@ grub_hfsplus_open (struct grub_file *file, const char *name)
|
||||
struct grub_hfsplus_data *data;
|
||||
struct grub_fshelp_node *fdiro = 0;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_hfsplus_mount (file->device->disk);
|
||||
if (!data)
|
||||
@@ -855,9 +851,7 @@ grub_hfsplus_open (struct grub_file *file, const char *name)
|
||||
grub_free (fdiro);
|
||||
grub_free (data);
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
@@ -868,9 +862,7 @@ grub_hfsplus_close (grub_file_t file)
|
||||
{
|
||||
grub_free (file->data);
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
@@ -916,9 +908,7 @@ grub_hfsplus_dir (grub_device_t device, const char *path,
|
||||
return hook (filename, &info);
|
||||
}
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_hfsplus_mount (device->disk);
|
||||
if (!data)
|
||||
@@ -939,9 +929,7 @@ grub_hfsplus_dir (grub_device_t device, const char *path,
|
||||
grub_free (fdiro);
|
||||
grub_free (data);
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
@@ -964,9 +952,7 @@ grub_hfsplus_mtime (grub_device_t device, grub_int32_t *tm)
|
||||
struct grub_hfsplus_data *data;
|
||||
grub_disk_t disk = device->disk;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_hfsplus_mount (disk);
|
||||
if (!data)
|
||||
@@ -974,9 +960,7 @@ grub_hfsplus_mtime (grub_device_t device, grub_int32_t *tm)
|
||||
else
|
||||
*tm = grub_be_to_cpu32 (data->volheader.utime) - 2082844800;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
grub_free (data);
|
||||
|
||||
@@ -990,9 +974,7 @@ grub_hfsplus_uuid (grub_device_t device, char **uuid)
|
||||
struct grub_hfsplus_data *data;
|
||||
grub_disk_t disk = device->disk;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_ref (my_mod);
|
||||
#endif
|
||||
|
||||
data = grub_hfsplus_mount (disk);
|
||||
if (data)
|
||||
@@ -1005,9 +987,7 @@ grub_hfsplus_uuid (grub_device_t device, char **uuid)
|
||||
else
|
||||
*uuid = NULL;
|
||||
|
||||
#ifndef GRUB_UTIL
|
||||
grub_dl_unref (my_mod);
|
||||
#endif
|
||||
|
||||
grub_free (data);
|
||||
|
||||
@@ -1032,9 +1012,7 @@ static struct grub_fs grub_hfsplus_fs =
|
||||
GRUB_MOD_INIT(hfsplus)
|
||||
{
|
||||
grub_fs_register (&grub_hfsplus_fs);
|
||||
#ifndef GRUB_UTIL
|
||||
my_mod = mod;
|
||||
#endif
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(hfsplus)
|
||||
|
||||
Reference in new issue
Block a user