vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-05-05 Pavel Roskin <proski@gnu.org>

Browse source 
* 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:
proski 2009-05-05 16:36:58 +00:00
parent de5fd76e95
commit 119494b506
20 changed files with 41 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fs/affs.c
View file

@ -104,9 +104,7 @@ struct grub_affs_data
int htsize;
};
#ifndef GRUB_UTIL
static grub_dl_t my_mod;
#endif
static grub_disk_addr_t
@ -392,9 +390,7 @@ grub_affs_open (struct grub_file *file, const char *name)
struct grub_affs_data *data;
struct grub_fshelp_node *fdiro = 0;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_affs_mount (file->device->disk);
if (!data)
@ -419,9 +415,7 @@ grub_affs_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;
}
@ -432,9 +426,7 @@ grub_affs_close (grub_file_t file)
{
grub_free (file->data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return GRUB_ERR_NONE;
}
@ -477,9 +469,7 @@ grub_affs_dir (grub_device_t device, const char *path,
return hook (filename, &info);
}
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_affs_mount (device->disk);
if (!data)
@ -497,9 +487,7 @@ grub_affs_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;
}
@ -512,9 +500,7 @@ grub_affs_label (grub_device_t device, char **label)
struct grub_affs_file file;
grub_disk_t disk = device->disk;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_affs_mount (disk);
if (data)
@ -533,9 +519,7 @@ grub_affs_label (grub_device_t device, char **label)
else
*label = 0;
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
grub_free (data);
@ -557,9 +541,7 @@ static struct grub_fs grub_affs_fs =
GRUB_MOD_INIT(affs)
{
grub_fs_register (&grub_affs_fs);
#ifndef GRUB_UTIL
my_mod = mod;
#endif
}
GRUB_MOD_FINI(affs)