From d9dbf11e16bfc3ca51ce297cc633a1b0936929d8 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 29 Feb 2012 14:10:04 +0100 Subject: [PATCH] * util/ieee1275/ofpath.c: Rename devname to sys_devname everywhere to avoid conflicts. --- ChangeLog | 5 +++++ util/ieee1275/ofpath.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35f54ac95..028532e37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-29 Vladimir Serbinenko + + * util/ieee1275/ofpath.c: Rename devname to sys_devname everywhere to + avoid conflicts. + 2012-02-29 Vladimir Serbinenko * util/ieee1275/grub-ofpathname.c: Add missing config.h include. diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c index 590cd579a..34132a267 100644 --- a/util/ieee1275/ofpath.c +++ b/util/ieee1275/ofpath.c @@ -244,7 +244,7 @@ get_basename(char *p) } static char * -of_path_of_vdisk(const char *devname __attribute__((unused)), +of_path_of_vdisk(const char *sys_devname __attribute__((unused)), const char *device, const char *devnode __attribute__((unused)), const char *devicenode) @@ -263,7 +263,7 @@ of_path_of_vdisk(const char *devname __attribute__((unused)), } static char * -of_path_of_ide(const char *devname __attribute__((unused)), const char *device, +of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *device, const char *devnode __attribute__((unused)), const char *devicenode) { @@ -350,7 +350,7 @@ check_sas (char *sysfs_path, int *tgt) } static char * -of_path_of_scsi(const char *devname __attribute__((unused)), const char *device, +of_path_of_scsi(const char *sys_devname __attribute__((unused)), const char *device, const char *devnode __attribute__((unused)), const char *devicenode) { @@ -419,11 +419,11 @@ strip_trailing_digits (const char *p) } char * -grub_util_devname_to_ofpath (const char *devname) +grub_util_devname_to_ofpath (const char *sys_devname) { char *name_buf, *device, *devnode, *devicenode, *ofpath; - name_buf = xrealpath (devname); + name_buf = xrealpath (sys_devname); device = get_basename (name_buf); devnode = strip_trailing_digits (name_buf);