o In Print_Chunk(), don't print the address of the chunk on ia64. It

doesn't have any meaning and only results in lines longer than 80
   characters.
o  In Delete_Chunk2(), also look for chunks of type "part" under
   chunks of type "whole" on ia64. They're not only under chunks of
   type "freebsd" there.
This commit is contained in:
Marcel Moolenaar 2003-11-02 07:44:59 +00:00
parent 0a46471721
commit 03e432ad9c

View file

@ -392,10 +392,12 @@ Print_Chunk(struct chunk *c1,int offset)
putchar('>');
for (; i < 10; i++)
putchar(' ');
printf("%p %8ld %8lu %8lu %-8s %-16s %-8s 0x%02x %s",
c1, c1->offset, c1->size, c1->end, c1->name, c1->sname,
chunk_name(c1->type), c1->subtype,
ShowChunkFlags(c1));
#ifndef __ia64__
printf("%p ", c1);
#endif
printf("%8ld %8lu %8lu %-8s %-16s %-8s 0x%02x %s", c1->offset,
c1->size, c1->end, c1->name, c1->sname, chunk_name(c1->type),
c1->subtype, ShowChunkFlags(c1));
putchar('\n');
Print_Chunk(c1->part, offset + 2);
Print_Chunk(c1->next, offset);
@ -430,6 +432,11 @@ Delete_Chunk2(struct disk *d, struct chunk *c, int rflags)
break;
case part:
c1 = Find_Mother_Chunk(d->chunks, c->offset, c->end, freebsd);
#ifdef __ia64__
if (c1 == NULL)
c1 = Find_Mother_Chunk(d->chunks, c->offset, c->end,
whole);
#endif
break;
default:
c1 = Find_Mother_Chunk(d->chunks, c->offset, c->end, extended);