summaryrefslogtreecommitdiff
path: root/sbin/dump
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2013-01-22 09:39:11 +0000
committerdholland <dholland@NetBSD.org>2013-01-22 09:39:11 +0000
commitd8eae7d25b49bac06cbad931bc3978073c028d65 (patch)
tree52fd0c429caf914f7378c1ccb0ce2a1d28b30a9e /sbin/dump
parent445568dc95e8e9c89e42d485d795140cae260244 (diff)
Stuff UFS_ in front of a few of ufs's symbols to reduce namespace
pollution. Specifically: ROOTINO -> UFS_ROOTINO WINO -> UFS_WINO NXADDR -> UFS_NXADDR NDADDR -> UFS_NDADDR NIADDR -> UFS_NIADDR MAXSYMLINKLEN -> UFS_MAXSYMLINKLEN MAXSYMLINKLEN_UFS[12] -> UFS[12]_MAXSYMLINKLEN (for consistency) Sort out ext2fs's misuse of NDADDR and NIADDR; fortunately, these have the same values in ext2fs and ffs. No functional change intended.
Diffstat (limited to 'sbin/dump')
-rw-r--r--sbin/dump/dump.h4
-rw-r--r--sbin/dump/ffs_inode.c6
-rw-r--r--sbin/dump/traverse.c24
3 files changed, 17 insertions, 17 deletions
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index d564fa7b90b..24c32154409 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.h,v 1.49 2013/01/13 23:45:35 dholland Exp $ */
+/* $NetBSD: dump.h,v 1.50 2013/01/22 09:39:11 dholland Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -72,7 +72,7 @@ struct ufsi {
#define ufs_blkoff(u,loc) /* calculates (loc % u->ufs_bsize) */ \
((loc) & (u)->ufs_qbmask)
#define ufs_dblksize(u,d,b) \
- ((((b) >= NDADDR || DIP((d), size) >= ((b)+1) << (u)->ufs_bshift \
+ ((((b) >= UFS_NDADDR || DIP((d), size) >= ((b)+1) << (u)->ufs_bshift \
? (u)->ufs_bsize \
: (ufs_fragroundup((u), ufs_blkoff(u, DIP((d), size)))))))
struct ufsi *ufsib;
diff --git a/sbin/dump/ffs_inode.c b/sbin/dump/ffs_inode.c
index 66bc5588c82..22dd718b10c 100644
--- a/sbin/dump/ffs_inode.c
+++ b/sbin/dump/ffs_inode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_inode.c,v 1.19 2013/01/13 22:59:31 dholland Exp $ */
+/* $NetBSD: ffs_inode.c,v 1.20 2013/01/22 09:39:11 dholland Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\
#endif /* not lint */
#ifndef lint
-__RCSID("$NetBSD: ffs_inode.c,v 1.19 2013/01/13 22:59:31 dholland Exp $");
+__RCSID("$NetBSD: ffs_inode.c,v 1.20 2013/01/22 09:39:11 dholland Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -206,7 +206,7 @@ fs_mapinodes(ino_t maxino __unused, u_int64_t *tape_size, int *anydirskipped)
continue;
}
for (i = 0; i < inosused; i++, ino++) {
- if (ino < ROOTINO)
+ if (ino < UFS_ROOTINO)
continue;
mapfileino(ino, tape_size, anydirskipped);
}
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 2efebabc4be..04388676f78 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: traverse.c,v 1.48 2008/08/12 13:28:35 simonb Exp $ */
+/* $NetBSD: traverse.c,v 1.49 2013/01/22 09:39:11 dholland Exp $ */
/*-
* Copyright (c) 1980, 1988, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
#else
-__RCSID("$NetBSD: traverse.c,v 1.48 2008/08/12 13:28:35 simonb Exp $");
+__RCSID("$NetBSD: traverse.c,v 1.49 2013/01/22 09:39:11 dholland Exp $");
#endif
#endif /* not lint */
@@ -98,10 +98,10 @@ blockest(union dinode *dp)
sizeest = howmany(ufs_fragroundup(ufsib, DIP(dp, size)), TP_BSIZE);
if (blkest > sizeest)
blkest = sizeest;
- if (DIP(dp, size) > ufsib->ufs_bsize * NDADDR) {
+ if (DIP(dp, size) > ufsib->ufs_bsize * UFS_NDADDR) {
/* calculate the number of indirect blocks on the dump tape */
blkest +=
- howmany(sizeest - NDADDR * ufsib->ufs_bsize / TP_BSIZE,
+ howmany(sizeest - UFS_NDADDR * ufsib->ufs_bsize / TP_BSIZE,
TP_NINDIR);
}
return (blkest + 1);
@@ -246,7 +246,7 @@ mapfiles(ino_t maxino, u_int64_t *tape_size, char *diskname, char * const *dirv)
* Ensure that the root inode actually appears in the
* file list for a subdir
*/
- mapfileino(ROOTINO, tape_size, &anydirskipped);
+ mapfileino(UFS_ROOTINO, tape_size, &anydirskipped);
} else {
fs_mapinodes(maxino, tape_size, &anydirskipped);
}
@@ -254,7 +254,7 @@ mapfiles(ino_t maxino, u_int64_t *tape_size, char *diskname, char * const *dirv)
* 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);
}
@@ -308,7 +308,7 @@ mapdirs(ino_t maxino, u_int64_t *tape_size)
else
di.dp1 = dp->dp1;
filesize = DIP(&di, size);
- for (ret = 0, i = 0; filesize > 0 && i < NDADDR; i++) {
+ for (ret = 0, i = 0; filesize > 0 && i < UFS_NDADDR; i++) {
if (is_ufs2)
blk = iswap64(di.dp2.di_db[i]);
else
@@ -322,7 +322,7 @@ mapdirs(ino_t maxino, u_int64_t *tape_size)
else
filesize -= ufsib->ufs_bsize;
}
- for (i = 0; filesize > 0 && i < NIADDR; i++) {
+ for (i = 0; filesize > 0 && i < UFS_NIADDR; i++) {
if (is_ufs2)
blk = iswap64(di.dp2.di_ib[i]);
else
@@ -570,8 +570,8 @@ dumpino(union dinode *dp, ino_t ino)
msg("Warning: undefined file type 0%o\n", DIP(dp, mode) & IFMT);
return;
}
- if (DIP(dp, size) > NDADDR * ufsib->ufs_bsize)
- cnt = NDADDR * ufsib->ufs_frag;
+ if (DIP(dp, size) > UFS_NDADDR * ufsib->ufs_bsize)
+ cnt = UFS_NDADDR * ufsib->ufs_frag;
else
cnt = howmany(DIP(dp, size), ufsib->ufs_fsize);
if (is_ufs2)
@@ -579,9 +579,9 @@ dumpino(union dinode *dp, ino_t ino)
else
blksout32(&dp->dp1.di_db[0], cnt, ino);
- if ((size = DIP(dp, size) - NDADDR * ufsib->ufs_bsize) <= 0)
+ if ((size = DIP(dp, size) - UFS_NDADDR * ufsib->ufs_bsize) <= 0)
return;
- for (ind_level = 0; ind_level < NIADDR; ind_level++) {
+ for (ind_level = 0; ind_level < UFS_NIADDR; ind_level++) {
if (is_ufs2)
blk = iswap64(dp->dp2.di_ib[ind_level]);
else