From owner-svn-src-all@freebsd.org Wed Aug 21 01:45:30 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9ABCFE6593; Wed, 21 Aug 2019 01:45:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Cr8V3btJz4KH4; Wed, 21 Aug 2019 01:45:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DECBC5E0; Wed, 21 Aug 2019 01:45:30 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7L1jUP2072182; Wed, 21 Aug 2019 01:45:30 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7L1jU3x072180; Wed, 21 Aug 2019 01:45:30 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201908210145.x7L1jU3x072180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 21 Aug 2019 01:45:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351319 - in head/usr.sbin/makefs: ffs msdos X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/usr.sbin/makefs: ffs msdos X-SVN-Commit-Revision: 351319 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Aug 2019 01:45:30 -0000 Author: emaste Date: Wed Aug 21 01:45:29 2019 New Revision: 351319 URL: https://svnweb.freebsd.org/changeset/base/351319 Log: makefs: use `char *` not `void *` for buf b_data, drop casts in msdos (The kernel uses caddr_t.) Suggested by: cem Reviewed by: cem MFC with: r351273 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21348 Modified: head/usr.sbin/makefs/ffs/buf.h head/usr.sbin/makefs/msdos/msdosfs_fat.c Modified: head/usr.sbin/makefs/ffs/buf.h ============================================================================== --- head/usr.sbin/makefs/ffs/buf.h Tue Aug 20 21:59:48 2019 (r351318) +++ head/usr.sbin/makefs/ffs/buf.h Wed Aug 21 01:45:29 2019 (r351319) @@ -54,7 +54,7 @@ struct vnode { }; struct buf { - void * b_data; + char * b_data; long b_bufsize; long b_bcount; daddr_t b_blkno; Modified: head/usr.sbin/makefs/msdos/msdosfs_fat.c ============================================================================== --- head/usr.sbin/makefs/msdos/msdosfs_fat.c Tue Aug 20 21:59:48 2019 (r351318) +++ head/usr.sbin/makefs/msdos/msdosfs_fat.c Wed Aug 21 01:45:29 2019 (r351319) @@ -220,9 +220,9 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp 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 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon 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 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon 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 @@ fatentry(int function, struct msdosfsmount *pmp, u_lon 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 @@ fatchain(struct msdosfsmount *pmp, u_long start, u_lon 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 @@ fatchain(struct msdosfsmount *pmp, u_long start, u_lon 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 @@ freeclusterchain(struct msdosfsmount *pmp, u_long clus 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 @@ freeclusterchain(struct msdosfsmount *pmp, u_long clus 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 @@ fillinusemap(struct msdosfsmount *pmp) } } 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;