diff options
author | phk <phk@FreeBSD.org> | 2002-10-22 09:13:02 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-10-22 09:13:02 +0000 |
commit | 43441f1d037b19165e361f523d20669b6b11bc25 (patch) | |
tree | 8378d0fbd151285dc2443b78fe8c309a83a37602 /lib/libdisk/disk.c | |
parent | 0cb4cfe3c6f594f0eb38c72c07c77d99b45b3f63 (diff) | |
download | FreeBSD-src-43441f1d037b19165e361f523d20669b6b11bc25.zip FreeBSD-src-43441f1d037b19165e361f523d20669b6b11bc25.tar.gz |
Swing the weed-whacker around libdisk:
Constify some things.
Staticize some things.
Remove some unused things.
Prototype some things.
Don't install a gazillion man-pages links.
Drop support for ON-TRACK disk-manager.
Diffstat (limited to 'lib/libdisk/disk.c')
-rw-r--r-- | lib/libdisk/disk.c | 58 |
1 files changed, 3 insertions, 55 deletions
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c index ddb4db7..3f83f2a 100644 --- a/lib/libdisk/disk.c +++ b/lib/libdisk/disk.c @@ -400,7 +400,7 @@ assignToSlice(void *arg, XMLToken t, u_int *slice, u_int64_t v) * Callback to collect disk-related data. */ static int -assignToDisk(void *arg, XMLToken t, u_int *slice, u_int64_t v) +assignToDisk(void *arg, XMLToken t, const u_int *slice, u_int64_t v) { struct disklabel *dl = (struct disklabel *) arg; @@ -471,7 +471,6 @@ Int_Open_Disk(const char *name, u_long size) struct dos_partition *dp; void *p; #endif - u_long offset = 0; #ifdef HAVE_GEOM char *confxml = NULL; size_t xmlsize; @@ -612,12 +611,6 @@ Int_Open_Disk(const char *name, u_long size) continue; if (!Read_Int32(&dp->dp_size)) continue; - - if (dp->dp_typ == DOSPTYP_ONTRACK) { - d->flags |= DISK_ON_TRACK; - offset = 63; - } - } free(p); #endif @@ -632,9 +625,9 @@ Int_Open_Disk(const char *name, u_long size) d->bios_cyl = size / (dl.d_ntracks * dl.d_nsectors); #ifdef PC98 - if (Add_Chunk(d, -offset, size, name, whole, 0, 0, "-")) + if (Add_Chunk(d, 0, size, name, whole, 0, 0, "-")) #else - if (Add_Chunk(d, -offset, size, name, whole, 0, 0)) + if (Add_Chunk(d, 0, size, name, whole, 0, 0)) #endif DPRINT(("Failed to add 'whole' chunk")); @@ -662,7 +655,6 @@ Int_Open_Disk(const char *name, u_long size) if (! ds.dss_slices[i].ds_size) continue; - ds.dss_slices[i].ds_offset -= offset; snprintf(sname, sizeof(sname), "%ss%d", name, i - 1); #ifdef PC98 subtype = ds.dss_slices[i].ds_type | @@ -849,7 +841,6 @@ void Debug_Disk(struct disk *d) { printf("Debug_Disk(%s)", d->name); - printf(" flags=%lx", d->flags); #if 0 printf(" real_geom=%lu/%lu/%lu", d->real_cyl, d->real_hd, d->real_sect); #endif @@ -887,49 +878,6 @@ Free_Disk(struct disk *d) free(d); } -struct disk * -Clone_Disk(struct disk *d) -{ - struct disk *d2; - - d2 = (struct disk*) malloc(sizeof *d2); - if(!d2) return NULL; - *d2 = *d; - d2->name = strdup(d2->name); - d2->chunks = Clone_Chunk(d2->chunks); -#ifdef PC98 - if(d2->bootipl) { - d2->bootipl = malloc(d2->bootipl_size); - memcpy(d2->bootipl, d->bootipl, d2->bootipl_size); - } - if(d2->bootmenu) { - d2->bootmenu = malloc(d2->bootmenu_size); - memcpy(d2->bootmenu, d->bootmenu, d2->bootmenu_size); - } -#else - if(d2->bootmgr) { - d2->bootmgr = malloc(d2->bootmgr_size); - memcpy(d2->bootmgr, d->bootmgr, d2->bootmgr_size); - } -#endif -#if defined(__i386__) - if(d2->boot1) { - d2->boot1 = malloc(512); - memcpy(d2->boot1, d->boot1, 512); - } - if(d2->boot2) { - d2->boot2 = malloc(512 * 15); - memcpy(d2->boot2, d->boot2, 512 * 15); - } -#elif defined(__alpha__) - if(d2->boot1) { - d2->boot1 = malloc(512 * 15); - memcpy(d2->boot1, d->boot1, 512 * 15); - } -#endif - return d2; -} - #if 0 void Collapse_Disk(struct disk *d) |