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

use lower case for the variable name MBR.

Browse source
This commit is contained in:
okuji 2000-12-21 22:35:01 +00:00
parent 2f0dff243a
commit d24002df4f
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-12-22 OKUJI Yoshinori <okuji@gnu.org>
* stage2/disk_io.c (make_saved_active): Change the variable name
``MBR'' to lower case.
(set_partition_hidden_flag): Likewise.
2000-12-20 Jochen Hoenicke <jochen@gnu.org> 2000-12-20 Jochen Hoenicke <jochen@gnu.org>
From Cedric Ware <ware@com.enst.fr>: From Cedric Ware <ware@com.enst.fr>:

25
stage2/disk_io.c
View file

@ -394,7 +394,7 @@ attempt_mount (void)
int int
make_saved_active (void) make_saved_active (void)
{ {
char MBR[512]; char mbr[512];
if (saved_drive & 0x80) if (saved_drive & 0x80)
{ {
@ -410,31 +410,31 @@ make_saved_active (void)
} }
/* Read the MBR in the scratch space. */ /* Read the MBR in the scratch space. */
if (! rawread (saved_drive, 0, 0, SECTOR_SIZE, (char *) MBR)) if (! rawread (saved_drive, 0, 0, SECTOR_SIZE, mbr))
return 0; return 0;
/* If the partition is an extended partition, setting the active /* If the partition is an extended partition, setting the active
flag violates the specification by IBM. */ flag violates the specification by IBM. */
if (IS_PC_SLICE_TYPE_EXTENDED (PC_SLICE_TYPE (MBR, part))) if (IS_PC_SLICE_TYPE_EXTENDED (PC_SLICE_TYPE (mbr, part)))
{ {
errnum = ERR_DEV_VALUES; errnum = ERR_DEV_VALUES;
return 0; return 0;
} }
/* Check if the active flag is disabled. */ /* Check if the active flag is disabled. */
if (PC_SLICE_FLAG (MBR, part) != PC_SLICE_FLAG_BOOTABLE) if (PC_SLICE_FLAG (mbr, part) != PC_SLICE_FLAG_BOOTABLE)
{ {
int i; int i;
/* Clear all the active flags in this table. */ /* Clear all the active flags in this table. */
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
PC_SLICE_FLAG (MBR, i) = 0; PC_SLICE_FLAG (mbr, i) = 0;
/* Set the flag. */ /* Set the flag. */
PC_SLICE_FLAG (MBR, part) = PC_SLICE_FLAG_BOOTABLE; PC_SLICE_FLAG (mbr, part) = PC_SLICE_FLAG_BOOTABLE;
/* Write back the MBR. */ /* Write back the MBR. */
if (! rawwrite (saved_drive, 0, MBR)) if (! rawwrite (saved_drive, 0, mbr))
return 0; return 0;
} }
} }
@ -453,7 +453,8 @@ make_saved_active (void)
int int
set_partition_hidden_flag (int hidden) set_partition_hidden_flag (int hidden)
{ {
char MBR[512]; char mbr[512];
if (current_drive & 0x80) if (current_drive & 0x80)
{ {
int part = current_partition >> 16; int part = current_partition >> 16;
@ -464,15 +465,15 @@ set_partition_hidden_flag (int hidden)
return 0; return 0;
} }
if (! rawread (current_drive, 0, 0, SECTOR_SIZE, (char *) MBR)) if (! rawread (current_drive, 0, 0, SECTOR_SIZE, mbr))
return 0; return 0;
if (hidden) if (hidden)
PC_SLICE_TYPE (MBR, part) |= PC_SLICE_TYPE_HIDDEN_FLAG; PC_SLICE_TYPE (mbr, part) |= PC_SLICE_TYPE_HIDDEN_FLAG;
else else
PC_SLICE_TYPE (MBR, part) &= ~PC_SLICE_TYPE_HIDDEN_FLAG; PC_SLICE_TYPE (mbr, part) &= ~PC_SLICE_TYPE_HIDDEN_FLAG;
if (! rawwrite (current_drive, 0, MBR)) if (! rawwrite (current_drive, 0, mbr))
return 0; return 0;
} }