svn commit: r351395 - head/sys/fs/msdosfs
Ed Maste
emaste at FreeBSD.org
Thu Aug 22 16:06:53 UTC 2019
Author: emaste
Date: Thu Aug 22 16:06:52 2019
New Revision: 351395
URL: https://svnweb.freebsd.org/changeset/base/351395
Log:
msdosfs_fat: reduce diffs with NetBSD and makefs
Use pointer arithmetic (as now done in makefs, and in NetBSD) instead of
taking the address of array element. No functional change, but this
makes it easier to compare different versions of this file.
Reviewed by: kib
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D21365
Modified:
head/sys/fs/msdosfs/msdosfs_fat.c
Modified: head/sys/fs/msdosfs/msdosfs_fat.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_fat.c Thu Aug 22 15:08:04 2019 (r351394)
+++ head/sys/fs/msdosfs/msdosfs_fat.c Thu Aug 22 16:06:52 2019 (r351395)
@@ -214,9 +214,9 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp
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 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon
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 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon
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 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon
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 @@ fatchain(struct msdosfsmount *pmp, u_long start, u_lon
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 @@ fatchain(struct msdosfsmount *pmp, u_long start, u_lon
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 @@ freeclusterchain(struct msdosfsmount *pmp, u_long clus
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 @@ freeclusterchain(struct msdosfsmount *pmp, u_long clus
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 @@ fillinusemap(struct msdosfsmount *pmp)
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;
More information about the svn-src-head
mailing list