vbatts/grub
1
0
Fork 0
Code Issues Pull requests 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 2015-03-04 01:00:19 +01:00
parent 9d25b0da9a
commit 27d1a67f8a
20 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
grub-core/bus/emu/pci.c
View file

@ -55,7 +55,8 @@ grub_pci_device_map_range (grub_pci_device_t dev, grub_addr_t base,
int err;
err = pci_device_map_range (dev, base, size, PCI_DEV_MAP_FLAG_WRITABLE, &addr);
if (err)
grub_util_error ("mapping 0x%x failed (error %d)\n", base, err);
grub_util_error ("mapping 0x%llx failed (error %d)\n",
(unsigned long long) base, err);
return addr;
}
@ -66,12 +67,12 @@ grub_pci_device_unmap_range (grub_pci_device_t dev, void *mem,
pci_device_unmap_range (dev, mem, size);
}
GRUB_MOD_INIT (pci)
GRUB_MOD_INIT (emupci)
{
pci_system_init ();
}
GRUB_MOD_FINI (pci)
GRUB_MOD_FINI (emupci)
{
pci_system_cleanup ();
}

4
grub-core/kern/emu/hostdisk.c
View file

@ -184,7 +184,7 @@ grub_hostdisk_os_dev_to_grub_drive (const char *os_disk, int add)
unsigned int i;
char *canon;
canon = canonicalize_file_name (os_disk);
canon = grub_canonicalize_file_name (os_disk);
if (!canon)
canon = xstrdup (os_disk);
@ -535,7 +535,7 @@ read_device_map (const char *dev_map)
/* On Linux, the devfs uses symbolic links horribly, and that
confuses the interface very much, so use realpath to expand
symbolic links. */
map[drive].device = canonicalize_file_name (p);
map[drive].device = grub_canonicalize_file_name (p);
if (! map[drive].device)
map[drive].device = xstrdup (p);

2
grub-core/osdep/aros/hostdisk.c
View file

@ -61,7 +61,7 @@
static ULONG *bounce;
char *
canonicalize_file_name (const char *path)
grub_canonicalize_file_name (const char *path)
{
char *ret;
BPTR lck;

4
grub-core/osdep/unix/getroot.c
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);

2
grub-core/osdep/unix/hostdisk.c
View file

@ -198,7 +198,7 @@ grub_util_fd_close (grub_util_fd_t fd)
}
char *
canonicalize_file_name (const char *path)
grub_canonicalize_file_name (const char *path)
{
#if defined (PATH_MAX)
char *ret;

2
grub-core/osdep/unix/relpath.c
View file

@ -44,7 +44,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
char *poolfs = NULL;
/* canonicalize. */
p = canonicalize_file_name (path);
p = grub_canonicalize_file_name (path);
if (p == NULL)
grub_util_error (_("failed to get canonical path of `%s'"), path);

2
grub-core/osdep/windows/hostdisk.c
View file

@ -328,7 +328,7 @@ grub_util_fd_strerror (void)
}
char *
canonicalize_file_name (const char *path)
grub_canonicalize_file_name (const char *path)
{
char *ret;
LPTSTR windows_path;

2
grub-core/osdep/windows/init.c
View file

@ -170,7 +170,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
#error "Unsupported TCHAR size"
#endif
grub_util_base_directory = canonicalize_file_name ((*argv)[0]);
grub_util_base_directory = grub_canonicalize_file_name ((*argv)[0]);
if (!grub_util_base_directory)
grub_util_base_directory = xstrdup ((*argv)[0]);
for (ptr = grub_util_base_directory + strlen (grub_util_base_directory) - 1;