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

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);