diff options
| author | wyllys <none@none> | 2005-09-27 08:36:40 -0700 |
|---|---|---|
| committer | wyllys <none@none> | 2005-09-27 08:36:40 -0700 |
| commit | 57e22c6cd28a5d6515e45e300d346e66d9b0c2b7 (patch) | |
| tree | 136b18f0e613066ef6f72e35b9785f751eda400f | |
| parent | 0576819e2cb798bc0aefd466904b6caa0be229f9 (diff) | |
| download | illumos-joyent-57e22c6cd28a5d6515e45e300d346e66d9b0c2b7.tar.gz | |
6217236 pcfs module has incorrect FAT signature check (fix lint)
6310335 mkfs_pcfs FAT size computation is wrong. (fix lint)
| -rw-r--r-- | usr/src/cmd/fs.d/pcfs/mkfs/mkfs.c | 14 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/pcfs/pc_vfsops.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/usr/src/cmd/fs.d/pcfs/mkfs/mkfs.c b/usr/src/cmd/fs.d/pcfs/mkfs/mkfs.c index e0544f90a8..78e851cbfc 100644 --- a/usr/src/cmd/fs.d/pcfs/mkfs/mkfs.c +++ b/usr/src/cmd/fs.d/pcfs/mkfs/mkfs.c @@ -1314,10 +1314,9 @@ static void compute_cluster_size(bpb_t *wbpb) { - ulong_t volsize, maxclusters; - ulong_t spc, spf; + ulong_t volsize; + ulong_t spc; ulong_t rds, tmpval1, tmpval2; - ulong_t disksz; ulong_t fatsz; volsize = wbpb->bpb.sectors_in_volume ? wbpb->bpb.sectors_in_volume : wbpb->bpb.sectors_in_logical_volume; @@ -1468,15 +1467,16 @@ compute_cluster_size(bpb_t *wbpb) wbpb->bpb.sectors_per_fat = 0; wbpb->bpb32.big_sectors_per_fat = fatsz; if (Verbose) - printf("compute_cluster_size: Sectors per FAT32 = %d\n", - wbpb->bpb32.big_sectors_per_fat); + (void) printf("compute_cluster_size: Sectors per " + "FAT32 = %d\n", + wbpb->bpb32.big_sectors_per_fat); break; case 12: default: /* 16 bit FAT */ wbpb->bpb.sectors_per_fat = (ushort_t)(fatsz & 0x0000FFFF); if (Verbose) - printf("compute_cluster_size: Sectors per FAT16 = %d\n", - wbpb->bpb.sectors_per_fat); + (void) printf("compute_cluster_size: Sectors per " + "FAT16 = %d\n", wbpb->bpb.sectors_per_fat); break; } } diff --git a/usr/src/uts/common/fs/pcfs/pc_vfsops.c b/usr/src/uts/common/fs/pcfs/pc_vfsops.c index 6729bf66d3..ba9faf1320 100644 --- a/usr/src/uts/common/fs/pcfs/pc_vfsops.c +++ b/usr/src/uts/common/fs/pcfs/pc_vfsops.c @@ -1177,7 +1177,7 @@ bpb_to_numclusters(uchar_t *cp) if (pcfsdebuglevel >= 5) { if (ltohs(bpb->f_bs.rdirents[0]) != 0) { - memcpy(FileSysType, &cp[54], 8); + (void) memcpy(FileSysType, &cp[54], 8); FileSysType[8] = 0; PC_DPRINTF1(5, "debug_bpb: FAT12/FAT16 FileSysType = " "%s", FileSysType); @@ -1329,7 +1329,6 @@ secondaryBPBChecks(uchar_t *cp) static int isBPB(uchar_t *cp, int *fattypep) { - int ret = 1; struct bootsec *bpb = (struct bootsec *)cp; uint_t numclusters; /* number of clusters in file area */ @@ -1511,7 +1510,6 @@ pc_getfat(struct pcfs *fsp) int nfat; int secsize; int fatsec; - int fattype; PC_DPRINTF0(5, "pc_getfat\n"); devvp = fsp->pcfs_devvp; |