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

merge from trunk

Browse source
This commit is contained in:
Colin Watson 2010-01-05 10:53:03 +00:00
commit bc11fee9f5
260 changed files with 7022 additions and 3839 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/ieee1275/devicemap.c
View file

@ -35,8 +35,10 @@ escape_of_path (const char *orig_path)
}
void
grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy UNUSED,
int *num_fd UNUSED, int *num_hd UNUSED)
grub_util_emit_devicemap_entry (FILE *fp, char *name,
int is_floppy __attribute__((unused)),
int *num_fd __attribute__((unused)),
int *num_hd __attribute__((unused)))
{
const char *orig_path = grub_util_devname_to_ofpath (name);
char *ofpath = escape_of_path (orig_path);

17
util/ieee1275/ofpath.c
View file

@ -39,7 +39,6 @@
#include <ctype.h>
#ifdef OFPATH_STANDALONE
#define UNUSED __attribute__((unused))
#define xmalloc malloc
void
grub_util_error (const char *fmt, ...)
@ -199,8 +198,10 @@ get_basename(char *p)
static void
of_path_of_vdisk(char *of_path,
const char *devname UNUSED, const char *device,
const char *devnode UNUSED, const char *devicenode)
const char *devname __attribute__((unused)),
const char *device,
const char *devnode __attribute__((unused)),
const char *devicenode)
{
char *sysfs_path, *p;
int devno, junk;
@ -217,8 +218,9 @@ of_path_of_vdisk(char *of_path,
static void
of_path_of_ide(char *of_path,
const char *devname UNUSED, const char *device,
const char *devnode UNUSED, const char *devicenode)
const char *devname __attribute__((unused)), const char *device,
const char *devnode __attribute__((unused)),
const char *devicenode)
{
char *sysfs_path, *p;
int chan, devno;
@ -299,8 +301,9 @@ check_sas (char *sysfs_path, int *tgt)
static void
of_path_of_scsi(char *of_path,
const char *devname UNUSED, const char *device,
const char *devnode UNUSED, const char *devicenode)
const char *devname __attribute__((unused)), const char *device,
const char *devnode __attribute__((unused)),
const char *devicenode)
{
const char *p, *digit_string, *disk_name;
int host, bus, tgt, lun;