#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.40 2002/01/16 09:32:14 stelian Exp $";
+ "$Id: traverse.c,v 1.43 2002/02/04 11:18:46 stelian Exp $";
#endif /* not lint */
#include <config.h>
dump_ino_t journal_ino = ext2_journal_ino(es);
if (es->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV){
- fprintf(stderr, "This an journal, not a filesystem!\n");
+ msg("This is a journal, not a filesystem!\n");
retval = EXT2_ET_UNSUPP_FEATURE;
ext2fs_close(*fs);
}
else if ((retval = es->s_feature_incompat &
~(EXT2_LIB_FEATURE_INCOMPAT_SUPP |
EXT3_FEATURE_INCOMPAT_RECOVER))) {
- fprintf(stderr,
- "Unsupported feature(s) 0x%x in filesystem\n",
+ msg("Unsupported feature(s) 0x%x in filesystem\n",
retval);
retval = EXT2_ET_UNSUPP_FEATURE;
ext2fs_close(*fs);
static void
mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)
{
- register int mode;
+ int mode;
/*
* Skip inode if we've already marked it for dumping
int
mapfiles(dump_ino_t maxino, long *tapesize)
{
- register dump_ino_t ino;
+ dump_ino_t ino;
int anydirskipped = 0;
for (ino = ROOTINO; ino < maxino; ino++)
static int
mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
{
- register struct dinode const *dp;
- register int mode;
+ struct dinode const *dp;
+ int mode;
errcode_t retval;
struct mapfile_context *mfc;
ext2_ino_t ino;
int
mapdirs(dump_ino_t maxino, long *tapesize)
{
- register struct dinode *dp;
- register int isdir;
- register char *map;
- register dump_ino_t ino;
+ struct dinode *dp;
+ int isdir;
+ char *map;
+ dump_ino_t ino;
#ifndef __linux__
- register int i;
+ int i;
long filesize;
#else
struct mapdirs_context mdc;
dirindir(dump_ino_t ino, daddr_t blkno, int ind_level, long *filesize)
{
int ret = 0;
- register int i;
+ int i;
daddr_t idblk[MAXNINDIR];
bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize);
static int
searchdir(dump_ino_t ino, daddr_t blkno, long size, long filesize)
{
- register struct direct *dp;
- register long loc, ret = 0;
+ struct direct *dp;
+ long loc, ret = 0;
char dblk[MAXBSIZE];
bread(fsbtodb(sblock, blkno), dblk, (int)size);
void
blksout(daddr_t *blkp, int frags, dump_ino_t ino)
{
- register daddr_t *bp;
+ daddr_t *bp;
int i, j, count, blks, tbperdb;
blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
void
dumpmap(char *map, int type, dump_ino_t ino)
{
- register int i;
+ int i;
char *cp;
spcl.c_type = type;
writerec(cp, 0);
}
-/*
- * Write a header record to the dump tape.
- */
#if defined __linux__ && !defined(int32_t)
#define int32_t __s32
#endif
+
+/*
+ * Compute and fill in checksum information.
+ */
void
-writeheader(dump_ino_t ino)
+mkchecksum(union u_spcl *tmpspcl)
{
- register int32_t sum, cnt, *lp;
+ int32_t sum, cnt, *lp;
- spcl.c_inumber = ino;
- spcl.c_magic = NFS_MAGIC;
- spcl.c_checksum = 0;
- lp = (int32_t *)&spcl;
+ tmpspcl->s_spcl.c_checksum = 0;
+ lp = (int32_t *)&tmpspcl->s_spcl;
sum = 0;
cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t));
while (--cnt >= 0) {
sum += *lp++;
sum += *lp++;
}
- spcl.c_checksum = CHECKSUM - sum;
+ tmpspcl->s_spcl.c_checksum = CHECKSUM - sum;
+}
+
+/*
+ * Write a header record to the dump tape.
+ */
+void
+writeheader(dump_ino_t ino)
+{
+ spcl.c_inumber = ino;
+ spcl.c_magic = NFS_MAGIC;
+ mkchecksum((union u_spcl *)&spcl);
writerec((char *)&spcl, 1);
}