diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-04-01 11:22:40 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-04-01 11:22:40 +0000 |
| commit | 656533ef4d45bc511a98bdc55e04c900928bef8a (patch) | |
| tree | 9fd35119734623e324ee327258727e40f9a94fa3 | |
| parent | a11b77ba787c70d9c1c5aea5ed25280e2203775b (diff) | |
Notes
| -rw-r--r-- | lib/libdisk/create_chunk.c | 9 | ||||
| -rw-r--r-- | lib/libdisk/write_disk.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index 3f8461933017..0fb2c78bb246 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -143,8 +143,12 @@ Fixup_Extended_Names(struct disk *d, struct chunk *c) void Fixup_Names(struct disk *d) { - struct chunk *c1, *c2, *c3; - int i,j; + struct chunk *c1, *c2; + int i; +#ifdef __i386__ + struct chunk *c3; + int j; +#endif c1 = d->chunks; for(i=1,c2 = c1->part; c2 ; c2 = c2->next) { @@ -260,6 +264,7 @@ Create_Chunk_DWIM(struct disk *d, struct chunk *parent , u_long size, chunk_e ty if (c1->offset == offset) return c1; barfout(1,"Serious internal trouble"); + return 0; } int diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c index 842b84a69a11..2511e3d0b6dd 100644 --- a/lib/libdisk/write_disk.c +++ b/lib/libdisk/write_disk.c @@ -183,7 +183,10 @@ Cfg_Boot_Mgr(u_char *mbr, int edd) int Write_Disk(struct disk *d1) { - int fd,i,j; + int fd,i; +#ifdef __i386__ + int j; +#endif struct disk *old = 0; struct chunk *c1; int ret = 0; |