Page MenuHomeFreeBSD
Files F135468051

D21365.diff
No OneTemporary
Actions

D21365.diff
View Options

Index: head/sys/fs/msdosfs/msdosfs_fat.c
===================================================================
--- head/sys/fs/msdosfs/msdosfs_fat.c
+++ head/sys/fs/msdosfs/msdosfs_fat.c
@@ -214,9 +214,9 @@
return (EIO);
}
if (FAT32(pmp))
- cn = getulong(&bp->b_data[bo]);
+ cn = getulong(bp->b_data + bo);
else
- cn = getushort(&bp->b_data[bo]);
+ cn = getushort(bp->b_data + bo);
if (FAT12(pmp) && (prevcn & 1))
cn >>= 4;
cn &= pmp->pm_fatmask;
@@ -510,9 +510,9 @@
if (function & FAT_GET) {
if (FAT32(pmp))
- readcn = getulong(&bp->b_data[bo]);
+ readcn = getulong(bp->b_data + bo);
else
- readcn = getushort(&bp->b_data[bo]);
+ readcn = getushort(bp->b_data + bo);
if (FAT12(pmp) & (cn & 1))
readcn >>= 4;
readcn &= pmp->pm_fatmask;
@@ -524,7 +524,7 @@
if (function & FAT_SET) {
switch (pmp->pm_fatmask) {
case FAT12_MASK:
- readcn = getushort(&bp->b_data[bo]);
+ readcn = getushort(bp->b_data + bo);
if (cn & 1) {
readcn &= 0x000f;
readcn |= newcontents << 4;
@@ -532,20 +532,20 @@
readcn &= 0xf000;
readcn |= newcontents & 0xfff;
}
- putushort(&bp->b_data[bo], readcn);
+ putushort(bp->b_data + bo, readcn);
break;
case FAT16_MASK:
- putushort(&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(&bp->b_data[bo]);
+ readcn = getulong(bp->b_data + bo);
readcn &= ~FAT32_MASK;
readcn |= newcontents & FAT32_MASK;
- putulong(&bp->b_data[bo], readcn);
+ putulong(bp->b_data + bo, readcn);
break;
}
updatefats(pmp, bp, bn);
@@ -595,7 +595,7 @@
newc = --count > 0 ? start : fillwith;
switch (pmp->pm_fatmask) {
case FAT12_MASK:
- readcn = getushort(&bp->b_data[bo]);
+ readcn = getushort(bp->b_data + bo);
if (start & 1) {
readcn &= 0xf000;
readcn |= newc & 0xfff;
@@ -603,20 +603,20 @@
readcn &= 0x000f;
readcn |= newc << 4;
}
- putushort(&bp->b_data[bo], readcn);
+ putushort(bp->b_data + bo, readcn);
bo++;
if (!(start & 1))
bo++;
break;
case FAT16_MASK:
- putushort(&bp->b_data[bo], newc);
+ putushort(bp->b_data + bo, newc);
bo += 2;
break;
case FAT32_MASK:
- readcn = getulong(&bp->b_data[bo]);
+ readcn = getulong(bp->b_data + bo);
readcn &= ~pmp->pm_fatmask;
readcn |= newc & pmp->pm_fatmask;
- putulong(&bp->b_data[bo], readcn);
+ putulong(bp->b_data + bo, readcn);
bo += 4;
break;
}
@@ -852,7 +852,7 @@
usemap_free(pmp, cluster);
switch (pmp->pm_fatmask) {
case FAT12_MASK:
- readcn = getushort(&bp->b_data[bo]);
+ readcn = getushort(bp->b_data + bo);
if (cluster & 1) {
cluster = readcn >> 4;
readcn &= 0x000f;
@@ -862,15 +862,15 @@
readcn &= 0xf000;
readcn |= MSDOSFSFREE & 0xfff;
}
- putushort(&bp->b_data[bo], readcn);
+ putushort(bp->b_data + bo, readcn);
break;
case FAT16_MASK:
- cluster = getushort(&bp->b_data[bo]);
- putushort(&bp->b_data[bo], MSDOSFSFREE);
+ cluster = getushort(bp->b_data + bo);
+ putushort(bp->b_data + bo, MSDOSFSFREE);
break;
case FAT32_MASK:
- cluster = getulong(&bp->b_data[bo]);
- putulong(&bp->b_data[bo],
+ cluster = getulong(bp->b_data + bo);
+ putulong(bp->b_data + bo,
(MSDOSFSFREE & FAT32_MASK) | (cluster & ~FAT32_MASK));
break;
}
@@ -924,9 +924,9 @@
return (error);
}
if (FAT32(pmp))
- readcn = getulong(&bp->b_data[bo]);
+ readcn = getulong(bp->b_data + bo);
else
- readcn = getushort(&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
Tue, Nov 11, 3:00 AM (2 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25135617
Default Alt Text
D21365.diff (3 KB)

Event Timeline