diff options
author | jhb <jhb@FreeBSD.org> | 2003-02-04 17:26:45 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2003-02-04 17:26:45 +0000 |
commit | 06360ae9a90b70971fed1cc884ca66c83b1d92aa (patch) | |
tree | abc0ac6bb7a42608df954ba63ef5490c0f7c6e47 /lib/libdisk | |
parent | ef78581d72695a025bb0b8b3f95e25a648be2861 (diff) | |
download | FreeBSD-src-06360ae9a90b70971fed1cc884ca66c83b1d92aa.zip FreeBSD-src-06360ae9a90b70971fed1cc884ca66c83b1d92aa.tar.gz |
Remove mostly unused disk arguments from Fixup_*_Names() functions.
Diffstat (limited to 'lib/libdisk')
-rw-r--r-- | lib/libdisk/create_chunk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index 8ce9057..ac7a544 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -36,10 +36,10 @@ __FBSDID("$FreeBSD$"); struct chunk *New_Chunk(void); static int -Fixup_FreeBSD_Names(struct disk *d, struct chunk *c) +Fixup_FreeBSD_Names(struct chunk *c) { struct chunk *c1, *c3; - int j; + uint j; if (!strcmp(c->name, "X")) return 0; @@ -114,7 +114,7 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c) #ifndef PC98 static int -Fixup_Extended_Names(struct disk *d, struct chunk *c) +Fixup_Extended_Names(struct chunk *c) { struct chunk *c1; int j = 5; @@ -126,9 +126,9 @@ Fixup_Extended_Names(struct disk *d, struct chunk *c) c1->name = malloc(12); if (!c1->name) return -1; - sprintf(c1->name, "%ss%d", d->chunks->name, j++); + sprintf(c1->name, "%ss%d", c->disk->chunks->name, j++); if (c1->type == freebsd) - if (Fixup_FreeBSD_Names(d, c1) != 0) + if (Fixup_FreeBSD_Names(c1) != 0) return -1; } return 0; @@ -175,10 +175,10 @@ Fixup_Names(struct disk *d) } for (c2 = c1->part; c2; c2 = c2->next) { if (c2->type == freebsd) - Fixup_FreeBSD_Names(d, c2); + Fixup_FreeBSD_Names(c2); #ifndef PC98 - if (c2->type == extended) - Fixup_Extended_Names(d, c2); + else if (c2->type == extended) + Fixup_Extended_Names(c2); #endif } return 0; @@ -222,7 +222,7 @@ Create_Chunk_DWIM(struct disk *d, struct chunk *parent, u_long size, { int i; struct chunk *c1; - u_long offset; + long offset; if (!parent) parent = d->chunks; |