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

2
grub-core/kern/corecmd.c
View file

@ -155,7 +155,7 @@ grub_core_cmd_ls (struct grub_command *cmd __attribute__ ((unused)),
}
else if (fs)
{
(fs->dir) (dev, path, grub_mini_print_files, NULL);
(fs->fs_dir) (dev, path, grub_mini_print_files, NULL);
grub_xputs ("\n");
grub_refresh ();
}

10
grub-core/kern/emu/hostfs.c
View file

@ -176,11 +176,11 @@ grub_hostfs_label (grub_device_t device __attribute ((unused)),
static struct grub_fs grub_hostfs_fs =
{
.name = "hostfs",
.dir = grub_hostfs_dir,
.open = grub_hostfs_open,
.read = grub_hostfs_read,
.close = grub_hostfs_close,
.label = grub_hostfs_label,
.fs_dir = grub_hostfs_dir,
.fs_open = grub_hostfs_open,
.fs_read = grub_hostfs_read,
.fs_close = grub_hostfs_close,
.fs_label = grub_hostfs_label,
.next = 0
};

8
grub-core/kern/file.c
View file

@ -107,7 +107,7 @@ grub_file_open (const char *name, enum grub_file_type type)
goto fail;
}
if ((file->fs->open) (file, file_name) != GRUB_ERR_NONE)
if ((file->fs->fs_open) (file, file_name) != GRUB_ERR_NONE)
goto fail;
file->name = grub_strdup (name);
@ -177,7 +177,7 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
file->read_hook_data = file;
file->progress_offset = file->offset;
}
res = (file->fs->read) (file, buf, len);
res = (file->fs->fs_read) (file, buf, len);
file->read_hook = read_hook;
file->read_hook_data = read_hook_data;
if (res > 0)
@ -189,8 +189,8 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
grub_err_t
grub_file_close (grub_file_t file)
{
if (file->fs->close)
(file->fs->close) (file);
if (file->fs->fs_close)
(file->fs->fs_close) (file);
if (file->device)
grub_device_close (file->device);

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

@ -64,13 +64,13 @@ grub_fs_probe (grub_device_t device)
if (grub_strcmp (p->name, "btrfs") == 0)
{
char *label = 0;
p->uuid (device, &label);
p->fs_uuid (device, &label);
if (label)
grub_free (label);
}
else
#endif
(p->dir) (device, "/", probe_dummy_iter, NULL);
(p->fs_dir) (device, "/", probe_dummy_iter, NULL);
if (grub_errno == GRUB_ERR_NONE)
return p;
@ -94,7 +94,7 @@ grub_fs_probe (grub_device_t device)
{
p = grub_fs_list;
(p->dir) (device, "/", probe_dummy_iter, NULL);
(p->fs_dir) (device, "/", probe_dummy_iter, NULL);
if (grub_errno == GRUB_ERR_NONE)
{
count--;
@ -243,9 +243,9 @@ grub_fs_blocklist_read (grub_file_t file, char *buf, grub_size_t len)
struct grub_fs grub_fs_blocklist =
{
.name = "blocklist",
.dir = 0,
.open = grub_fs_blocklist_open,
.read = grub_fs_blocklist_read,
.close = 0,
.fs_dir = 0,
.fs_open = grub_fs_blocklist_open,
.fs_read = grub_fs_blocklist_read,
.fs_close = 0,
.next = 0
};