vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
avoid conflicts.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 14:10:04 +01:00
parent 0c42a45dcc
commit d9dbf11e16
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* util/ieee1275/grub-ofpathname.c: Add missing config.h include. * util/ieee1275/grub-ofpathname.c: Add missing config.h include.

10
util/ieee1275/ofpath.c
View file

@ -244,7 +244,7 @@ get_basename(char *p)
} }
static char * 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 *device,
const char *devnode __attribute__((unused)), const char *devnode __attribute__((unused)),
const char *devicenode) const char *devicenode)
@ -263,7 +263,7 @@ of_path_of_vdisk(const char *devname __attribute__((unused)),
} }
static char * 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 *devnode __attribute__((unused)),
const char *devicenode) const char *devicenode)
{ {
@ -350,7 +350,7 @@ check_sas (char *sysfs_path, int *tgt)
} }
static char * 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 *devnode __attribute__((unused)),
const char *devicenode) const char *devicenode)
{ {
@ -419,11 +419,11 @@ strip_trailing_digits (const char *p)
} }
char * 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; char *name_buf, *device, *devnode, *devicenode, *ofpath;
name_buf = xrealpath (devname); name_buf = xrealpath (sys_devname);
device = get_basename (name_buf); device = get_basename (name_buf);
devnode = strip_trailing_digits (name_buf); devnode = strip_trailing_digits (name_buf);