Module Name: src Committed By: dholland Date: Wed Jun 19 17:51:27 UTC 2013
Modified Files: src/sbin/dump: ffs_inode.c src/sbin/fsck_ext2fs: inode.c pass1.c setup.c src/sbin/fsck_ffs: dir.c inode.c pass1.c setup.c src/sbin/fsdb: fsdb.c src/sbin/fsirand: fsirand.c src/sbin/newfs: mkfs.c src/sbin/newfs_ext2fs: mke2fs.c src/sbin/resize_ffs: resize_ffs.c src/sbin/scan_ffs: scan_ffs.c src/sys/arch/mvme68k/stand/installboot: installboot.c src/sys/lib/libsa: ext2fs.c lfsv1.c lfsv2.c minixfs3.c minixfs3.h ufs.c src/sys/ufs/ext2fs: ext2fs.h ext2fs_inode.c ext2fs_readwrite.c ext2fs_subr.c ext2fs_vfsops.c src/sys/ufs/ffs: ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c fs.h src/sys/ufs/lfs: lfs.h ulfs_rename.c src/sys/ufs/ufs: dir.h ufs_readwrite.c ufs_rename.c src/usr.sbin/installboot: ext2fs.c ffs.c src/usr.sbin/makefs: ffs.c src/usr.sbin/makefs/ffs: ffs_alloc.c ffs_balloc.c mkfs.c ufs_bmap.c src/usr.sbin/quot: quot.c Log Message: Rename ambiguous macros: MAXDIRSIZE -> UFS_MAXDIRSIZE or LFS_MAXDIRSIZE NINDIR -> FFS_NINDIR, EXT2_NINDIR, LFS_NINDIR, or MFS_NINDIR INOPB -> FFS_INOPB, LFS_INOPB INOPF -> FFS_INOPF, LFS_INOPF blksize -> ffs_blksize, ext2_blksize, or lfs_blksize sblksize -> ffs_blksize These are not the only ambiguously defined filesystem macros, of course, there's a pile more. I may not have found all the ambiguous definitions of blksize(), too, as there are a lot of other things called 'blksize' in the system. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sbin/dump/ffs_inode.c cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_ext2fs/inode.c cvs rdiff -u -r1.23 -r1.24 src/sbin/fsck_ext2fs/pass1.c cvs rdiff -u -r1.29 -r1.30 src/sbin/fsck_ext2fs/setup.c cvs rdiff -u -r1.55 -r1.56 src/sbin/fsck_ffs/dir.c cvs rdiff -u -r1.65 -r1.66 src/sbin/fsck_ffs/inode.c cvs rdiff -u -r1.51 -r1.52 src/sbin/fsck_ffs/pass1.c cvs rdiff -u -r1.97 -r1.98 src/sbin/fsck_ffs/setup.c cvs rdiff -u -r1.46 -r1.47 src/sbin/fsdb/fsdb.c cvs rdiff -u -r1.29 -r1.30 src/sbin/fsirand/fsirand.c cvs rdiff -u -r1.115 -r1.116 src/sbin/newfs/mkfs.c cvs rdiff -u -r1.18 -r1.19 src/sbin/newfs_ext2fs/mke2fs.c cvs rdiff -u -r1.34 -r1.35 src/sbin/resize_ffs/resize_ffs.c cvs rdiff -u -r1.21 -r1.22 src/sbin/scan_ffs/scan_ffs.c cvs rdiff -u -r1.16 -r1.17 \ src/sys/arch/mvme68k/stand/installboot/installboot.c cvs rdiff -u -r1.15 -r1.16 src/sys/lib/libsa/ext2fs.c cvs rdiff -u -r1.7 -r1.8 src/sys/lib/libsa/lfsv1.c src/sys/lib/libsa/lfsv2.c cvs rdiff -u -r1.1 -r1.2 src/sys/lib/libsa/minixfs3.c \ src/sys/lib/libsa/minixfs3.h cvs rdiff -u -r1.60 -r1.61 src/sys/lib/libsa/ufs.c cvs rdiff -u -r1.33 -r1.34 src/sys/ufs/ext2fs/ext2fs.h cvs rdiff -u -r1.78 -r1.79 src/sys/ufs/ext2fs/ext2fs_inode.c cvs rdiff -u -r1.62 -r1.63 src/sys/ufs/ext2fs/ext2fs_readwrite.c cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/ext2fs/ext2fs_subr.c cvs rdiff -u -r1.169 -r1.170 src/sys/ufs/ext2fs/ext2fs_vfsops.c cvs rdiff -u -r1.133 -r1.134 src/sys/ufs/ffs/ffs_alloc.c cvs rdiff -u -r1.56 -r1.57 src/sys/ufs/ffs/ffs_balloc.c cvs rdiff -u -r1.112 -r1.113 src/sys/ufs/ffs/ffs_inode.c cvs rdiff -u -r1.123 -r1.124 src/sys/ufs/ffs/ffs_snapshot.c cvs rdiff -u -r1.60 -r1.61 src/sys/ufs/ffs/fs.h cvs rdiff -u -r1.154 -r1.155 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/ulfs_rename.c cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/ufs/dir.h cvs rdiff -u -r1.105 -r1.106 src/sys/ufs/ufs/ufs_readwrite.c cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/ufs/ufs_rename.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/installboot/ext2fs.c cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/installboot/ffs.c cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/makefs/ffs.c cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/makefs/ffs/ffs_alloc.c cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/ffs/ffs_balloc.c \ src/usr.sbin/makefs/ffs/ufs_bmap.c cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/makefs/ffs/mkfs.c cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/quot/quot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.