Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 14:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

* grub-core/partmap/amiga.c (GRUB_AMIGA_RDSK_MAGIC): New define.

Browse Source 
(amiga_partition_map_iterate): Use grub_memcmp instead of grub_strcmp.
	Reported by:EHeM.
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-12-31 14:55:55 +01:00
1 parent b12b923e63
commit 307806cb53
2 files changed
+9 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2010-12-31 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/amiga.c (GRUB_AMIGA_RDSK_MAGIC): New define.
(amiga_partition_map_iterate): Use grub_memcmp instead of grub_strcmp.
Reported by:EHeM.
2010-12-31 Vladimir Serbinenko <phcoder@gmail.com> 2010-12-31 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/bsdXX.c (grub_openbsd_find_ramdisk): Silence * grub-core/loader/i386/bsdXX.c (grub_openbsd_find_ramdisk): Silence
grub-core/partmap/amiga.c
+3 -1
View File
@@ -27,6 +27,7 @@ struct grub_amiga_rdsk
{ {
/* "RDSK". */ /* "RDSK". */
grub_uint8_t magic[4]; grub_uint8_t magic[4];
#define GRUB_AMIGA_RDSK_MAGIC "RDSK"
grub_uint32_t size; grub_uint32_t size;
grub_int32_t checksum; grub_int32_t checksum;
grub_uint32_t scsihost; grub_uint32_t scsihost;
@@ -87,7 +88,8 @@ amiga_partition_map_iterate (grub_disk_t disk,
if (grub_disk_read (disk, pos, 0, sizeof (rdsk), &rdsk)) if (grub_disk_read (disk, pos, 0, sizeof (rdsk), &rdsk))
return grub_errno; return grub_errno;
if (grub_strcmp ((char *) rdsk.magic, "RDSK") == 0) if (grub_memcmp (rdsk.magic, GRUB_AMIGA_RDSK_MAGIC,
sizeof (rdsk.magic)) == 0)
{ {
/* Found the first PART block. */ /* Found the first PART block. */
next = grub_be_to_cpu32 (rdsk.partitionlst); next = grub_be_to_cpu32 (rdsk.partitionlst);