prefix UFS symbols with UFS_ to reduce namespace pollution

Specifically:
  ROOTINO -> UFS_ROOTINO
  WINO -> UFS_WINO
  NXADDR -> UFS_NXADDR
  NDADDR -> UFS_NDADDR
  NIADDR -> UFS_NIADDR
  MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency)

Also prefix ext2's and nandfs's NDADDR and NIADDR with EXT2_ and NANDFS_

Reviewed by:	kib, mckusick
Obtained from:	NetBSD
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D9536

1 files changed, 18 insertions, 19 deletions

diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 2aa0305a6867..864d9e528ca3 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -118,11 +118,10 @@ blockest(union dinode *dp)
 	sizeest = howmany(DIP(dp, di_size), TP_BSIZE);
 	if (blkest > sizeest)
 		blkest = sizeest;
-	if (DIP(dp, di_size) > sblock->fs_bsize * NDADDR) {
+	if (DIP(dp, di_size) > sblock->fs_bsize * UFS_NDADDR) {
 		/* calculate the number of indirect blocks on the dump tape */
-		blkest +=
-			howmany(sizeest - NDADDR * sblock->fs_bsize / TP_BSIZE,
-			TP_NINDIR);
+		blkest += howmany(sizeest -
+		    UFS_NDADDR * sblock->fs_bsize / TP_BSIZE, TP_NINDIR);
 	}
 	return (blkest + 1);
 }
@@ -192,7 +191,7 @@ mapfiles(ino_t maxino, long *tapesize)
 				continue;
 		}
 		for (i = 0; i < inosused; i++, ino++) {
-			if (ino < ROOTINO ||
+			if (ino < UFS_ROOTINO ||
 			    (dp = getino(ino, &mode)) == NULL ||
 			    (mode & IFMT) == 0)
 				continue;
@@ -232,7 +231,7 @@ mapfiles(ino_t maxino, long *tapesize)
 	 * Restore gets very upset if the root is not dumped,
 	 * so ensure that it always is dumped.
 	 */
-	SETINO(ROOTINO, dumpinomap);
+	SETINO(UFS_ROOTINO, dumpinomap);
 	return (anydirskipped);
 }
 
@@ -284,7 +283,7 @@ mapdirs(ino_t maxino, long *tapesize)
 		else
 			di.dp2 = dp->dp2;
 		filesize = DIP(&di, di_size);
-		for (ret = 0, i = 0; filesize > 0 && i < NDADDR; i++) {
+		for (ret = 0, i = 0; filesize > 0 && i < UFS_NDADDR; i++) {
 			if (DIP(&di, di_db[i]) != 0)
 				ret |= searchdir(ino, DIP(&di, di_db[i]),
 				    (long)sblksize(sblock, DIP(&di, di_size),
@@ -294,7 +293,7 @@ mapdirs(ino_t maxino, long *tapesize)
 			else
 				filesize -= sblock->fs_bsize;
 		}
-		for (i = 0; filesize > 0 && i < NIADDR; i++) {
+		for (i = 0; filesize > 0 && i < UFS_NIADDR; i++) {
 			if (DIP(&di, di_ib[i]) == 0)
 				continue;
 			ret |= dirindir(ino, DIP(&di, di_ib[i]), i, &filesize,
@@ -556,8 +555,8 @@ dumpino(union dinode *dp, ino_t ino)
 		    DIP(dp, di_mode) & IFMT);
 		return;
 	}
-	if (DIP(dp, di_size) > NDADDR * sblock->fs_bsize) {
-		cnt = NDADDR * sblock->fs_frag;
+	if (DIP(dp, di_size) > UFS_NDADDR * sblock->fs_bsize) {
+		cnt = UFS_NDADDR * sblock->fs_frag;
 		last = 0;
 	} else {
 		cnt = howmany(DIP(dp, di_size), sblock->fs_fsize);
@@ -567,9 +566,9 @@ dumpino(union dinode *dp, ino_t ino)
 		ufs1_blksout(&dp->dp1.di_db[0], cnt, ino);
 	else
 		ufs2_blksout(dp, &dp->dp2.di_db[0], cnt, ino, last);
-	if ((size = DIP(dp, di_size) - NDADDR * sblock->fs_bsize) <= 0)
+	if ((size = DIP(dp, di_size) - UFS_NDADDR * sblock->fs_bsize) <= 0)
 		return;
-	for (ind_level = 0; ind_level < NIADDR; ind_level++) {
+	for (ind_level = 0; ind_level < UFS_NIADDR; ind_level++) {
 		dmpindir(dp, ino, DIP(dp, di_ib[ind_level]), ind_level, &size);
 		if (size <= 0)
 			return;
@@ -740,8 +739,8 @@ appendextdata(union dinode *dp)
 	 * part of them here, we simply push them entirely into a
 	 * new block rather than putting some here and some later.
 	 */
-	if (spcl.c_extsize > NXADDR * sblock->fs_bsize)
-		blks = howmany(NXADDR * sblock->fs_bsize, TP_BSIZE);
+	if (spcl.c_extsize > UFS_NXADDR * sblock->fs_bsize)
+		blks = howmany(UFS_NXADDR * sblock->fs_bsize, TP_BSIZE);
 	else
 		blks = howmany(spcl.c_extsize, TP_BSIZE);
 	if (spcl.c_count + blks > TP_NINDIR)
@@ -784,8 +783,8 @@ writeextdata(union dinode *dp, ino_t ino, int added)
 	 * dump them out in a new block, otherwise just dump the data.
 	 */
 	if (added == 0) {
-		if (spcl.c_extsize > NXADDR * sblock->fs_bsize) {
-			frags = NXADDR * sblock->fs_frag;
+		if (spcl.c_extsize > UFS_NXADDR * sblock->fs_bsize) {
+			frags = UFS_NXADDR * sblock->fs_frag;
 			last = 0;
 		} else {
 			frags = howmany(spcl.c_extsize, sblock->fs_fsize);
@@ -793,8 +792,8 @@ writeextdata(union dinode *dp, ino_t ino, int added)
 		}
 		ufs2_blksout(dp, &dp->dp2.di_extb[0], frags, ino, last);
 	} else {
-		if (spcl.c_extsize > NXADDR * sblock->fs_bsize)
-			blks = howmany(NXADDR * sblock->fs_bsize, TP_BSIZE);
+		if (spcl.c_extsize > UFS_NXADDR * sblock->fs_bsize)
+			blks = howmany(UFS_NXADDR * sblock->fs_bsize, TP_BSIZE);
 		else
 			blks = howmany(spcl.c_extsize, TP_BSIZE);
 		tbperdb = sblock->fs_bsize >> tp_bshift;
@@ -820,7 +819,7 @@ writeextdata(union dinode *dp, ino_t ino, int added)
 	 * If the extended attributes fall into an indirect block,
 	 * dump it as well.
 	 */
-	if ((size = spcl.c_extsize - NXADDR * sblock->fs_bsize) > 0)
+	if ((size = spcl.c_extsize - UFS_NXADDR * sblock->fs_bsize) > 0)
 		dmpindir(dp, ino, dp->dp2.di_exti, 0, &size);
 }