* util/ieee1275/ofpath.c: Rename devname to sys_devname everywhere to

	avoid conflicts.

diff --git a/ChangeLog b/ChangeLog
index 35f54ac953645bbd8109ff1ceccb91edb1a4f447..028532e37cd18a599e6231abc64d2d6a981703f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/ieee1275/ofpath.c: Rename devname to sys_devname everywhere to
+       avoid conflicts.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/ieee1275/grub-ofpathname.c: Add missing config.h include.

diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index 590cd579a2eae0196b64c24b7931797c49bd2614..34132a267c3f17e0bb7574256155a0b6e5d15091 100644 (file)
--- 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);