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

Remove practice of assigning random const pointers to device id.

Browse source 
This is not required as cache code already checks driver id as well.
This commit is contained in:
Vladimir Serbinenko 2013-12-16 14:49:11 +01:00
parent f009f07c95
commit cc6fb517de
5 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-12-16 Vladimir Serbinenko <phcoder@gmail.com>
Remove practice of assigning random const pointers to device id.
This is not required as cache code already checks driver id as well.
2013-12-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-16 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/x86_64/types.h: Define sizeof (long) as 4 when compiling * include/grub/x86_64/types.h: Define sizeof (long) as 4 when compiling

2
grub-core/disk/host.c
View file

@ -49,7 +49,7 @@ grub_host_open (const char *name, grub_disk_t disk)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a host disk"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a host disk");
disk->total_sectors = 0; disk->total_sectors = 0;
disk->id = (unsigned long) "host"; disk->id = 0;
disk->data = 0; disk->data = 0;

2
grub-core/disk/memdisk.c
View file

@ -47,7 +47,7 @@ grub_memdisk_open (const char *name, grub_disk_t disk)
disk->total_sectors = memdisk_size / GRUB_DISK_SECTOR_SIZE; disk->total_sectors = memdisk_size / GRUB_DISK_SECTOR_SIZE;
disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE; disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
disk->id = (unsigned long) "mdsk"; disk->id = 0;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

2
grub-core/fs/cbfs.c
View file

@ -291,7 +291,7 @@ grub_cbfsdisk_open (const char *name, grub_disk_t disk)
disk->total_sectors = cbfsdisk_size / GRUB_DISK_SECTOR_SIZE; disk->total_sectors = cbfsdisk_size / GRUB_DISK_SECTOR_SIZE;
disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE; disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
disk->id = (unsigned long) "cbfs"; disk->id = 0;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

2
grub-core/fs/proc.c
View file

@ -44,7 +44,7 @@ grub_procdev_open (const char *name, grub_disk_t disk)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a procfs disk"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a procfs disk");
disk->total_sectors = 0; disk->total_sectors = 0;
disk->id = (unsigned long) "proc"; disk->id = 0;
disk->data = 0; disk->data = 0;