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 Vladimir Serbinenko
parent c6725996a9
commit ad4bfeec5c
55 changed files with 247 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/grub-fstest.c
View file

@ -470,9 +470,9 @@ fstest (int n)
fs = grub_fs_probe (dev);
if (!fs)
grub_util_error ("%s", grub_errmsg);
if (!fs->uuid)
if (!fs->fs_uuid)
grub_util_error ("%s", _("couldn't retrieve UUID"));
if (fs->uuid (dev, &uuid))
if (fs->fs_uuid (dev, &uuid))
grub_util_error ("%s", grub_errmsg);
if (!uuid)
grub_util_error ("%s", _("couldn't retrieve UUID"));

4
util/grub-install.c
View file

@ -1378,8 +1378,8 @@ main (int argc, char *argv[])
{
char *uuid = NULL;
/* generic method (used on coreboot and ata mod). */
if (!force_file_id && grub_fs->uuid && grub_fs->uuid (grub_dev,
&uuid))
if (!force_file_id
&& grub_fs->fs_uuid && grub_fs->fs_uuid (grub_dev, &uuid))
{
grub_print_error ();
grub_errno = 0;

4
util/grub-mount.c
View file

@ -190,7 +190,7 @@ fuse_getattr (const char *path, struct stat *st)
}
/* It's the whole device. */
(fs->dir) (dev, path2, fuse_getattr_find_file, &ctx);
(fs->fs_dir) (dev, path2, fuse_getattr_find_file, &ctx);
grub_free (path2);
if (!ctx.file_exists)
@ -352,7 +352,7 @@ fuse_readdir (const char *path, void *buf,
&& pathname[grub_strlen (pathname) - 1] == '/')
pathname[grub_strlen (pathname) - 1] = 0;
(fs->dir) (dev, pathname, fuse_readdir_call_fill, &ctx);
(fs->fs_dir) (dev, pathname, fuse_readdir_call_fill, &ctx);
free (pathname);
grub_errno = GRUB_ERR_NONE;
return 0;

8
util/grub-probe.c
View file

@ -446,10 +446,10 @@ probe (const char *path, char **device_names, char delim)
else if (print == PRINT_FS_UUID)
{
char *uuid;
if (! fs->uuid)
if (! fs->fs_uuid)
grub_util_error (_("%s does not support UUIDs"), fs->name);
if (fs->uuid (dev, &uuid) != GRUB_ERR_NONE)
if (fs->fs_uuid (dev, &uuid) != GRUB_ERR_NONE)
grub_util_error ("%s", grub_errmsg);
printf ("%s", uuid);
@ -458,11 +458,11 @@ probe (const char *path, char **device_names, char delim)
else if (print == PRINT_FS_LABEL)
{
char *label;
if (! fs->label)
if (! fs->fs_label)
grub_util_error (_("filesystem `%s' does not support labels"),
fs->name);
if (fs->label (dev, &label) != GRUB_ERR_NONE)
if (fs->fs_label (dev, &label) != GRUB_ERR_NONE)
grub_util_error ("%s", grub_errmsg);
printf ("%s", label);

6
util/setup.c
View file

@ -491,7 +491,7 @@ SETUP (const char *dir,
goto unable_to_embed;
}
if (fs && !fs->embed)
if (fs && !fs->fs_embed)
{
grub_util_warn (_("File system `%s' doesn't support embedding"),
fs->name);
@ -529,8 +529,8 @@ SETUP (const char *dir,
err = ctx.dest_partmap->embed (dest_dev->disk, &nsec, maxsec,
GRUB_EMBED_PCBIOS, &sectors);
else
err = fs->embed (dest_dev, &nsec, maxsec,
GRUB_EMBED_PCBIOS, &sectors);
err = fs->fs_embed (dest_dev, &nsec, maxsec,
GRUB_EMBED_PCBIOS, &sectors);
if (!err && nsec < core_sectors)
{
err = grub_error (GRUB_ERR_OUT_OF_RANGE,