Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 06:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix canonicalize_file_name clash.

Browse Source 
canonicalize_file_name clashed with gnulib function. Additionally
it was declared in 2 places: emu/misc.h and util/misc.h. Added
grub_ prefix and removed second declaration.
This commit is contained in:
Vladimir Serbinenko committed 2015-03-04 01:00:19 +01:00
1 parent 9d25b0da9a
commit 27d1a67f8a
20 files changed
+30 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/osdep/unix/getroot.c
+2 -2
View File
@@ -491,7 +491,7 @@ grub_guess_root_devices (const char *dir_in)
char **os_dev = NULL;
struct stat st;
dev_t dev;
char *dir = canonicalize_file_name (dir_in);
char *dir = grub_canonicalize_file_name (dir_in);
if (!dir)
grub_util_error (_("failed to get canonical path of `%s'"), dir_in);
@@ -516,7 +516,7 @@ grub_guess_root_devices (const char *dir_in)
*cur = tmp;
else
{
*cur = canonicalize_file_name (tmp);
*cur = grub_canonicalize_file_name (tmp);
if (*cur == NULL)
grub_util_error (_("failed to get canonical path of `%s'"), tmp);
free (tmp);