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

Change fs functions to add fs_ prefix

Browse source 
This avoid conflict with gnulib

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Vladimir Serbinenko 2019-04-08 07:24:24 +02:00 • committed by Vincent Batts
parent 08452decc8
commit afeb7b4bd9
55 changed files with 260 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grub-core/fs/affs.c
View file

@ -685,12 +685,12 @@ grub_affs_mtime (grub_device_t device, grub_int32_t *t)
static struct grub_fs grub_affs_fs =
{
.name = "affs",
.dir = grub_affs_dir,
.open = grub_affs_open,
.read = grub_affs_read,
.close = grub_affs_close,
.label = grub_affs_label,
.mtime = grub_affs_mtime,
.fs_dir = grub_affs_dir,
.fs_open = grub_affs_open,
.fs_read = grub_affs_read,
.fs_close = grub_affs_close,
.fs_label = grub_affs_label,
.fs_mtime = grub_affs_mtime,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,

12
grub-core/fs/bfs.c
View file

@ -1082,13 +1082,13 @@ static struct grub_fs grub_bfs_fs = {
#else
.name = "bfs",
#endif
.dir = grub_bfs_dir,
.open = grub_bfs_open,
.read = grub_bfs_read,
.close = grub_bfs_close,
.label = grub_bfs_label,
.fs_dir = grub_bfs_dir,
.fs_open = grub_bfs_open,
.fs_read = grub_bfs_read,
.fs_close = grub_bfs_close,
.fs_label = grub_bfs_label,
#ifndef MODE_AFS
.uuid = grub_bfs_uuid,
.fs_uuid = grub_bfs_uuid,
#endif
#ifdef GRUB_UTIL
.reserved_first_sector = 1,

14
grub-core/fs/btrfs.c
View file

@ -2172,14 +2172,14 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)),
static struct grub_fs grub_btrfs_fs = {
.name = "btrfs",
.dir = grub_btrfs_dir,
.open = grub_btrfs_open,
.read = grub_btrfs_read,
.close = grub_btrfs_close,
.uuid = grub_btrfs_uuid,
.label = grub_btrfs_label,
.fs_dir = grub_btrfs_dir,
.fs_open = grub_btrfs_open,
.fs_read = grub_btrfs_read,
.fs_close = grub_btrfs_close,
.fs_uuid = grub_btrfs_uuid,
.fs_label = grub_btrfs_label,
#ifdef GRUB_UTIL
.embed = grub_btrfs_embed,
.fs_embed = grub_btrfs_embed,
.reserved_first_sector = 1,
.blocklist_install = 0,
#endif

8
grub-core/fs/cbfs.c
View file

@ -375,10 +375,10 @@ fini_cbfsdisk (void)
static struct grub_fs grub_cbfs_fs = {
.name = "cbfs",
.dir = grub_cbfs_dir,
.open = grub_cbfs_open,
.read = grub_cbfs_read,
.close = grub_cbfs_close,
.fs_dir = grub_cbfs_dir,
.fs_open = grub_cbfs_open,
.fs_read = grub_cbfs_read,
.fs_close = grub_cbfs_close,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 0,

8
grub-core/fs/cpio_common.c
View file

@ -233,10 +233,10 @@ grub_cpio_close (grub_file_t file)
static struct grub_fs grub_cpio_fs = {
.name = FSNAME,
.dir = grub_cpio_dir,
.open = grub_cpio_open,
.read = grub_cpio_read,
.close = grub_cpio_close,
.fs_dir = grub_cpio_dir,
.fs_open = grub_cpio_open,
.fs_read = grub_cpio_read,
.fs_close = grub_cpio_close,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 0,

14
grub-core/fs/ext2.c
View file

@ -1072,13 +1072,13 @@ grub_ext2_mtime (grub_device_t device, grub_int32_t *tm)
static struct grub_fs grub_ext2_fs =
{
.name = "ext2",
.dir = grub_ext2_dir,
.open = grub_ext2_open,
.read = grub_ext2_read,
.close = grub_ext2_close,
.label = grub_ext2_label,
.uuid = grub_ext2_uuid,
.mtime = grub_ext2_mtime,
.fs_dir = grub_ext2_dir,
.fs_open = grub_ext2_open,
.fs_read = grub_ext2_read,
.fs_close = grub_ext2_close,
.fs_label = grub_ext2_label,
.fs_uuid = grub_ext2_uuid,
.fs_mtime = grub_ext2_mtime,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

12
grub-core/fs/f2fs.c
View file

@ -1289,12 +1289,12 @@ grub_f2fs_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_f2fs_fs = {
.name = "f2fs",
.dir = grub_f2fs_dir,
.open = grub_f2fs_open,
.read = grub_f2fs_read,
.close = grub_f2fs_close,
.label = grub_f2fs_label,
.uuid = grub_f2fs_uuid,
.fs_dir = grub_f2fs_dir,
.fs_open = grub_f2fs_open,
.fs_read = grub_f2fs_read,
.fs_close = grub_f2fs_close,
.fs_label = grub_f2fs_label,
.fs_uuid = grub_f2fs_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 0,

12
grub-core/fs/fat.c
View file

@ -1229,12 +1229,12 @@ static struct grub_fs grub_fat_fs =
#else
.name = "fat",
#endif
.dir = grub_fat_dir,
.open = grub_fat_open,
.read = grub_fat_read,
.close = grub_fat_close,
.label = grub_fat_label,
.uuid = grub_fat_uuid,
.fs_dir = grub_fat_dir,
.fs_open = grub_fat_open,
.fs_read = grub_fat_read,
.fs_close = grub_fat_close,
.fs_label = grub_fat_label,
.fs_uuid = grub_fat_uuid,
#ifdef GRUB_UTIL
#ifdef MODE_EXFAT
/* ExFAT BPB is 30 larger than FAT32 one. */

14
grub-core/fs/hfs.c
View file

@ -1417,13 +1417,13 @@ grub_hfs_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_hfs_fs =
{
.name = "hfs",
.dir = grub_hfs_dir,
.open = grub_hfs_open,
.read = grub_hfs_read,
.close = grub_hfs_close,
.label = grub_hfs_label,
.uuid = grub_hfs_uuid,
.mtime = grub_hfs_mtime,
.fs_dir = grub_hfs_dir,
.fs_open = grub_hfs_open,
.fs_read = grub_hfs_read,
.fs_close = grub_hfs_close,
.fs_label = grub_hfs_label,
.fs_uuid = grub_hfs_uuid,
.fs_mtime = grub_hfs_mtime,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

14
grub-core/fs/hfsplus.c
View file

@ -1078,13 +1078,13 @@ grub_hfsplus_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_hfsplus_fs =
{
.name = "hfsplus",
.dir = grub_hfsplus_dir,
.open = grub_hfsplus_open,
.read = grub_hfsplus_read,
.close = grub_hfsplus_close,
.label = grub_hfsplus_label,
.mtime = grub_hfsplus_mtime,
.uuid = grub_hfsplus_uuid,
.fs_dir = grub_hfsplus_dir,
.fs_open = grub_hfsplus_open,
.fs_read = grub_hfsplus_read,
.fs_close = grub_hfsplus_close,
.fs_label = grub_hfsplus_label,
.fs_mtime = grub_hfsplus_mtime,
.fs_uuid = grub_hfsplus_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

14
grub-core/fs/iso9660.c
View file

@ -1099,13 +1099,13 @@ grub_iso9660_mtime (grub_device_t device, grub_int32_t *timebuf)
static struct grub_fs grub_iso9660_fs =
{
.name = "iso9660",
.dir = grub_iso9660_dir,
.open = grub_iso9660_open,
.read = grub_iso9660_read,
.close = grub_iso9660_close,
.label = grub_iso9660_label,
.uuid = grub_iso9660_uuid,
.mtime = grub_iso9660_mtime,
.fs_dir = grub_iso9660_dir,
.fs_open = grub_iso9660_open,
.fs_read = grub_iso9660_read,
.fs_close = grub_iso9660_close,
.fs_label = grub_iso9660_label,
.fs_uuid = grub_iso9660_uuid,
.fs_mtime = grub_iso9660_mtime,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

12
grub-core/fs/jfs.c
View file

@ -930,12 +930,12 @@ grub_jfs_label (grub_device_t device, char **label)
static struct grub_fs grub_jfs_fs =
{
.name = "jfs",
.dir = grub_jfs_dir,
.open = grub_jfs_open,
.read = grub_jfs_read,
.close = grub_jfs_close,
.label = grub_jfs_label,
.uuid = grub_jfs_uuid,
.fs_dir = grub_jfs_dir,
.fs_open = grub_jfs_open,
.fs_read = grub_jfs_read,
.fs_close = grub_jfs_close,
.fs_label = grub_jfs_label,
.fs_uuid = grub_jfs_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

8
grub-core/fs/minix.c
View file

@ -687,10 +687,10 @@ static struct grub_fs grub_minix_fs =
.name = "minix",
#endif
#endif
.dir = grub_minix_dir,
.open = grub_minix_open,
.read = grub_minix_read,
.close = grub_minix_close,
.fs_dir = grub_minix_dir,
.fs_open = grub_minix_open,
.fs_read = grub_minix_read,
.fs_close = grub_minix_close,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

14
grub-core/fs/nilfs2.c
View file

@ -1192,13 +1192,13 @@ grub_nilfs2_mtime (grub_device_t device, grub_int32_t * tm)
static struct grub_fs grub_nilfs2_fs = {
.name = "nilfs2",
.dir = grub_nilfs2_dir,
.open = grub_nilfs2_open,
.read = grub_nilfs2_read,
.close = grub_nilfs2_close,
.label = grub_nilfs2_label,
.uuid = grub_nilfs2_uuid,
.mtime = grub_nilfs2_mtime,
.fs_dir = grub_nilfs2_dir,
.fs_open = grub_nilfs2_open,
.fs_read = grub_nilfs2_read,
.fs_close = grub_nilfs2_close,
.fs_label = grub_nilfs2_label,
.fs_uuid = grub_nilfs2_uuid,
.fs_mtime = grub_nilfs2_mtime,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 0,

12
grub-core/fs/ntfs.c
View file

@ -1212,12 +1212,12 @@ grub_ntfs_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_ntfs_fs =
{
.name = "ntfs",
.dir = grub_ntfs_dir,
.open = grub_ntfs_open,
.read = grub_ntfs_read,
.close = grub_ntfs_close,
.label = grub_ntfs_label,
.uuid = grub_ntfs_uuid,
.fs_dir = grub_ntfs_dir,
.fs_open = grub_ntfs_open,
.fs_read = grub_ntfs_read,
.fs_close = grub_ntfs_close,
.fs_label = grub_ntfs_label,
.fs_uuid = grub_ntfs_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

8
grub-core/fs/proc.c
View file

@ -183,10 +183,10 @@ static struct grub_disk_dev grub_procfs_dev = {
static struct grub_fs grub_procfs_fs =
{
.name = "procfs",
.dir = grub_procfs_dir,
.open = grub_procfs_open,
.read = grub_procfs_read,
.close = grub_procfs_close,
.fs_dir = grub_procfs_dir,
.fs_open = grub_procfs_open,
.fs_read = grub_procfs_read,
.fs_close = grub_procfs_close,
.next = 0
};

12
grub-core/fs/reiserfs.c
View file

@ -1402,12 +1402,12 @@ grub_reiserfs_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_reiserfs_fs =
{
.name = "reiserfs",
.dir = grub_reiserfs_dir,
.open = grub_reiserfs_open,
.read = grub_reiserfs_read,
.close = grub_reiserfs_close,
.label = grub_reiserfs_label,
.uuid = grub_reiserfs_uuid,
.fs_dir = grub_reiserfs_dir,
.fs_open = grub_reiserfs_open,
.fs_read = grub_reiserfs_read,
.fs_close = grub_reiserfs_close,
.fs_label = grub_reiserfs_label,
.fs_uuid = grub_reiserfs_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

10
grub-core/fs/romfs.c
View file

@ -461,11 +461,11 @@ grub_romfs_label (grub_device_t device, char **label)
static struct grub_fs grub_romfs_fs =
{
.name = "romfs",
.dir = grub_romfs_dir,
.open = grub_romfs_open,
.read = grub_romfs_read,
.close = grub_romfs_close,
.label = grub_romfs_label,
.fs_dir = grub_romfs_dir,
.fs_open = grub_romfs_open,
.fs_read = grub_romfs_read,
.fs_close = grub_romfs_close,
.fs_label = grub_romfs_label,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 0,

10
grub-core/fs/sfs.c
View file

@ -741,11 +741,11 @@ grub_sfs_label (grub_device_t device, char **label)
static struct grub_fs grub_sfs_fs =
{
.name = "sfs",
.dir = grub_sfs_dir,
.open = grub_sfs_open,
.read = grub_sfs_read,
.close = grub_sfs_close,
.label = grub_sfs_label,
.fs_dir = grub_sfs_dir,
.fs_open = grub_sfs_open,
.fs_read = grub_sfs_read,
.fs_close = grub_sfs_close,
.fs_label = grub_sfs_label,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 1,

10
grub-core/fs/squash4.c
View file

@ -995,11 +995,11 @@ grub_squash_mtime (grub_device_t dev, grub_int32_t *tm)
static struct grub_fs grub_squash_fs =
{
.name = "squash4",
.dir = grub_squash_dir,
.open = grub_squash_open,
.read = grub_squash_read,
.close = grub_squash_close,
.mtime = grub_squash_mtime,
.fs_dir = grub_squash_dir,
.fs_open = grub_squash_open,
.fs_read = grub_squash_read,
.fs_close = grub_squash_close,
.fs_mtime = grub_squash_mtime,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 0,

8
grub-core/fs/tar.c
View file

@ -324,10 +324,10 @@ grub_cpio_close (grub_file_t file)
static struct grub_fs grub_cpio_fs = {
.name = "tarfs",
.dir = grub_cpio_dir,
.open = grub_cpio_open,
.read = grub_cpio_read,
.close = grub_cpio_close,
.fs_dir = grub_cpio_dir,
.fs_open = grub_cpio_open,
.fs_read = grub_cpio_read,
.fs_close = grub_cpio_close,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 0,

12
grub-core/fs/udf.c
View file

@ -1345,12 +1345,12 @@ grub_udf_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_udf_fs = {
.name = "udf",
.dir = grub_udf_dir,
.open = grub_udf_open,
.read = grub_udf_read,
.close = grub_udf_close,
.label = grub_udf_label,
.uuid = grub_udf_uuid,
.fs_dir = grub_udf_dir,
.fs_open = grub_udf_open,
.fs_read = grub_udf_read,
.fs_close = grub_udf_close,
.fs_label = grub_udf_label,
.fs_uuid = grub_udf_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 1,
.blocklist_install = 1,

14
grub-core/fs/ufs.c
View file

@ -875,13 +875,13 @@ static struct grub_fs grub_ufs_fs =
.name = "ufs1",
#endif
#endif
.dir = grub_ufs_dir,
.open = grub_ufs_open,
.read = grub_ufs_read,
.close = grub_ufs_close,
.label = grub_ufs_label,
.uuid = grub_ufs_uuid,
.mtime = grub_ufs_mtime,
.fs_dir = grub_ufs_dir,
.fs_open = grub_ufs_open,
.fs_read = grub_ufs_read,
.fs_close = grub_ufs_close,
.fs_label = grub_ufs_label,
.fs_uuid = grub_ufs_uuid,
.fs_mtime = grub_ufs_mtime,
/* FIXME: set reserved_first_sector. */
#ifdef GRUB_UTIL
.blocklist_install = 1,

12
grub-core/fs/xfs.c
View file

@ -1137,12 +1137,12 @@ grub_xfs_uuid (grub_device_t device, char **uuid)
static struct grub_fs grub_xfs_fs =
{
.name = "xfs",
.dir = grub_xfs_dir,
.open = grub_xfs_open,
.read = grub_xfs_read,
.close = grub_xfs_close,
.label = grub_xfs_label,
.uuid = grub_xfs_uuid,
.fs_dir = grub_xfs_dir,
.fs_open = grub_xfs_open,
.fs_read = grub_xfs_read,
.fs_close = grub_xfs_close,
.fs_label = grub_xfs_label,
.fs_uuid = grub_xfs_uuid,
#ifdef GRUB_UTIL
.reserved_first_sector = 0,
.blocklist_install = 1,

16
grub-core/fs/zfs/zfs.c
View file

@ -4348,15 +4348,15 @@ grub_zfs_embed (grub_device_t device __attribute__ ((unused)),
static struct grub_fs grub_zfs_fs = {
.name = "zfs",
.dir = grub_zfs_dir,
.open = grub_zfs_open,
.read = grub_zfs_read,
.close = grub_zfs_close,
.label = zfs_label,
.uuid = zfs_uuid,
.mtime = zfs_mtime,
.fs_dir = grub_zfs_dir,
.fs_open = grub_zfs_open,
.fs_read = grub_zfs_read,
.fs_close = grub_zfs_close,
.fs_label = zfs_label,
.fs_uuid = zfs_uuid,
.fs_mtime = zfs_mtime,
#ifdef GRUB_UTIL
.embed = grub_zfs_embed,
.fs_embed = grub_zfs_embed,
.reserved_first_sector = 1,
.blocklist_install = 0,
#endif