Page MenuHomeFreeBSD
Files F137893583

D21348.id61070.diff
No OneTemporary
Actions

D21348.id61070.diff
View Options

Index: head/usr.sbin/makefs/ffs/buf.h
===================================================================
--- head/usr.sbin/makefs/ffs/buf.h
+++ head/usr.sbin/makefs/ffs/buf.h
@@ -54,7 +54,7 @@
};
struct buf {
- void * b_data;
+ char * b_data;
long b_bufsize;
long b_bcount;
daddr_t b_blkno;
Index: head/usr.sbin/makefs/msdos/msdosfs_fat.c
===================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_fat.c
+++ head/usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -220,9 +220,9 @@
return (EIO);
}
if (FAT32(pmp))
- cn = getulong((char *)bp->b_data + bo);
+ cn = getulong(bp->b_data + bo);
else
- cn = getushort((char *)bp->b_data + bo);
+ cn = getushort(bp->b_data + bo);
if (FAT12(pmp) && (prevcn & 1))
cn >>= 4;
cn &= pmp->pm_fatmask;
@@ -502,9 +502,9 @@
if (function & FAT_GET) {
if (FAT32(pmp))
- readcn = getulong((char *)bp->b_data + bo);
+ readcn = getulong(bp->b_data + bo);
else
- readcn = getushort((char *)bp->b_data + bo);
+ readcn = getushort(bp->b_data + bo);
if (FAT12(pmp) & (cn & 1))
readcn >>= 4;
readcn &= pmp->pm_fatmask;
@@ -516,7 +516,7 @@
if (function & FAT_SET) {
switch (pmp->pm_fatmask) {
case FAT12_MASK:
- readcn = getushort((char *)bp->b_data + bo);
+ readcn = getushort(bp->b_data + bo);
if (cn & 1) {
readcn &= 0x000f;
readcn |= newcontents << 4;
@@ -524,20 +524,20 @@
readcn &= 0xf000;
readcn |= newcontents & 0xfff;
}
- putushort((char *)bp->b_data + bo, readcn);
+ putushort(bp->b_data + bo, readcn);
break;
case FAT16_MASK:
- putushort((char *)bp->b_data + bo, newcontents);
+ putushort(bp->b_data + bo, newcontents);
break;
case FAT32_MASK:
/*
* According to spec we have to retain the
* high order bits of the FAT entry.
*/
- readcn = getulong((char *)bp->b_data + bo);
+ readcn = getulong(bp->b_data + bo);
readcn &= ~FAT32_MASK;
readcn |= newcontents & FAT32_MASK;
- putulong((char *)bp->b_data + bo, readcn);
+ putulong(bp->b_data + bo, readcn);
break;
}
updatefats(pmp, bp, bn);
@@ -587,7 +587,7 @@
newc = --count > 0 ? start : fillwith;
switch (pmp->pm_fatmask) {
case FAT12_MASK:
- readcn = getushort((char *)bp->b_data + bo);
+ readcn = getushort(bp->b_data + bo);
if (start & 1) {
readcn &= 0xf000;
readcn |= newc & 0xfff;
@@ -595,20 +595,20 @@
readcn &= 0x000f;
readcn |= newc << 4;
}
- putushort((char *)bp->b_data + bo, readcn);
+ putushort(bp->b_data + bo, readcn);
bo++;
if (!(start & 1))
bo++;
break;
case FAT16_MASK:
- putushort((char *)bp->b_data + bo, newc);
+ putushort(bp->b_data + bo, newc);
bo += 2;
break;
case FAT32_MASK:
- readcn = getulong((char *)bp->b_data + bo);
+ readcn = getulong(bp->b_data + bo);
readcn &= ~pmp->pm_fatmask;
readcn |= newc & pmp->pm_fatmask;
- putulong((char *)bp->b_data + bo, readcn);
+ putulong(bp->b_data + bo, readcn);
bo += 4;
break;
}
@@ -833,7 +833,7 @@
usemap_free(pmp, cluster);
switch (pmp->pm_fatmask) {
case FAT12_MASK:
- readcn = getushort((char *)bp->b_data + bo);
+ readcn = getushort(bp->b_data + bo);
if (cluster & 1) {
cluster = readcn >> 4;
readcn &= 0x000f;
@@ -843,15 +843,15 @@
readcn &= 0xf000;
readcn |= MSDOSFSFREE & 0xfff;
}
- putushort((char *)bp->b_data + bo, readcn);
+ putushort(bp->b_data + bo, readcn);
break;
case FAT16_MASK:
- cluster = getushort((char *)bp->b_data + bo);
- putushort((char *)bp->b_data + bo, MSDOSFSFREE);
+ cluster = getushort(bp->b_data + bo);
+ putushort(bp->b_data + bo, MSDOSFSFREE);
break;
case FAT32_MASK:
- cluster = getulong((char *)bp->b_data + bo);
- putulong((char *)bp->b_data + bo,
+ cluster = getulong(bp->b_data + bo);
+ putulong(bp->b_data + bo,
(MSDOSFSFREE & FAT32_MASK) | (cluster & ~FAT32_MASK));
break;
}
@@ -903,9 +903,9 @@
}
}
if (FAT32(pmp))
- readcn = getulong((char *)bp->b_data + bo);
+ readcn = getulong(bp->b_data + bo);
else
- readcn = getushort((char *)bp->b_data + bo);
+ readcn = getushort(bp->b_data + bo);
if (FAT12(pmp) && (cn & 1))
readcn >>= 4;
readcn &= pmp->pm_fatmask;

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 27, 11:22 PM (16 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26266022
Default Alt Text
D21348.id61070.diff (4 KB)

Event Timeline