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

14
fs/cpio.c
View file

@ -74,9 +74,7 @@ struct grub_cpio_data
grub_uint32_t size;
};
#ifndef GRUB_UTIL
static grub_dl_t my_mod;
#endif
static grub_err_t
grub_cpio_find_file (struct grub_cpio_data *data, char **name,
@ -192,9 +190,7 @@ grub_cpio_dir (grub_device_t device, const char *path,
const char *np;
int len;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
prev = 0;
@ -251,9 +247,7 @@ fail:
if (data)
grub_free (data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return grub_errno;
}
@ -266,9 +260,7 @@ grub_cpio_open (grub_file_t file, const char *name)
char *fn;
int i, j;
#ifndef GRUB_UTIL
grub_dl_ref (my_mod);
#endif
data = grub_cpio_mount (file->device->disk);
if (!data)
@ -322,9 +314,7 @@ fail:
if (data)
grub_free (data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return grub_errno;
}
@ -344,9 +334,7 @@ grub_cpio_close (grub_file_t file)
{
grub_free (file->data);
#ifndef GRUB_UTIL
grub_dl_unref (my_mod);
#endif
return grub_errno;
}
@ -370,9 +358,7 @@ GRUB_MOD_INIT (tar)
#endif
{
grub_fs_register (&grub_cpio_fs);
#ifndef GRUB_UTIL
my_mod = mod;
#endif
}
#ifdef MODE_USTAR