d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFi386: WARNS=4 clean.

Browse Source
This commit is contained in:
Yoshihiro Takahashi 2004-03-30 12:22:31 +00:00
parent 1251855f52
commit c16289f1c1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libdisk/write_pc98_disk.c
View File

@ -64,7 +64,7 @@ Write_Disk(const struct disk *d1)
struct chunk *c1; struct chunk *c1;
int ret = 0; int ret = 0;
char device[64]; char device[64];
u_char *mbr; u_char *mbrblk;
struct pc98_partition *dp, work[NDOSPART]; struct pc98_partition *dp, work[NDOSPART];
int s[7]; int s[7];
int PC98_EntireDisk = 0; int PC98_EntireDisk = 0;
@ -87,11 +87,11 @@ Write_Disk(const struct disk *d1)
} }
memset(s, 0, sizeof s); memset(s, 0, sizeof s);
mbr = read_block(fd, 1, d1->sector_size); mbrblk = read_block(fd, 1, d1->sector_size);
dp = (struct pc98_partition *)(mbr + DOSPARTOFF); dp = (struct pc98_partition *)(mbrblk + DOSPARTOFF);
memcpy(work, dp, sizeof work); memcpy(work, dp, sizeof work);
dp = work; dp = work;
free(mbr); free(mbrblk);
for (c1 = d1->chunks->part; c1; c1 = c1->next) { for (c1 = d1->chunks->part; c1; c1 = c1->next) {
if (c1->type == unused) if (c1->type == unused)
continue; continue;
@ -151,15 +151,15 @@ Write_Disk(const struct disk *d1)
if (d1->bootipl) if (d1->bootipl)
write_block(fd, 0, d1->bootipl, d1->sector_size); write_block(fd, 0, d1->bootipl, d1->sector_size);
mbr = read_block(fd, 1, d1->sector_size); mbrblk = read_block(fd, 1, d1->sector_size);
memcpy(mbr + DOSPARTOFF, dp, sizeof *dp * NDOSPART); memcpy(mbrblk + DOSPARTOFF, dp, sizeof *dp * NDOSPART);
/* XXX - for entire FreeBSD(98) */ /* XXX - for entire FreeBSD(98) */
for (c1 = d1->chunks->part; c1; c1 = c1->next) for (c1 = d1->chunks->part; c1; c1 = c1->next)
if (((c1->type == freebsd) || (c1->type == fat)) if (((c1->type == freebsd) || (c1->type == fat))
&& (c1->offset == 0)) && (c1->offset == 0))
PC98_EntireDisk = 1; PC98_EntireDisk = 1;
if (PC98_EntireDisk == 0) if (PC98_EntireDisk == 0)
write_block(fd, 1, mbr, d1->sector_size); write_block(fd, 1, mbrblk, d1->sector_size);
if (d1->bootmenu) if (d1->bootmenu)
for (i = 0; i * d1->sector_size < d1->bootmenu_size; i++) for (i = 0; i * d1->sector_size < d1->bootmenu_size; i++)