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

Rename grub_disk members

Browse source 
Otherwise it horribly clashes with gnulib when it's
replacing open/write/read/close

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
This commit is contained in:
Vladimir Serbinenko 2019-03-22 17:07:00 +01:00 • committed by Vladimir Serbinenko
parent 3562536fd5
commit 384091967d
23 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -328,11 +328,11 @@ static struct grub_disk_dev grub_cbfsdisk_dev =
{
.name = "cbfsdisk",
.id = GRUB_DISK_DEVICE_CBFSDISK_ID,
.iterate = grub_cbfsdisk_iterate,
.open = grub_cbfsdisk_open,
.close = grub_cbfsdisk_close,
.read = grub_cbfsdisk_read,
.write = grub_cbfsdisk_write,
.disk_iterate = grub_cbfsdisk_iterate,
.disk_open = grub_cbfsdisk_open,
.disk_close = grub_cbfsdisk_close,
.disk_read = grub_cbfsdisk_read,
.disk_write = grub_cbfsdisk_write,
.next = 0
};

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

@ -172,11 +172,11 @@ grub_procfs_open (struct grub_file *file, const char *path)
static struct grub_disk_dev grub_procfs_dev = {
.name = "proc",
.id = GRUB_DISK_DEVICE_PROCFS_ID,
.iterate = grub_procdev_iterate,
.open = grub_procdev_open,
.close = grub_procdev_close,
.read = grub_procdev_read,
.write = grub_procdev_write,
.disk_iterate = grub_procdev_iterate,
.disk_open = grub_procdev_open,
.disk_close = grub_procdev_close,
.disk_read = grub_procdev_read,
.disk_write = grub_procdev_write,
.next = 0
};