kill "register".

[dump.git] / dump / traverse.c

diff --git a/dump/traverse.c b/dump/traverse.c
index 06eeb7373cb0954cf3512c3191aedded1f859265..147717ad37095eb80a40032550f92f39ec80ac6e 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -41,7 +41,7 @@
 
 #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.42 2002/01/25 15:08:59 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -241,7 +241,7 @@ blockest(struct dinode const *dp)
 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
@@ -335,7 +335,7 @@ mapfiles(dump_ino_t maxino, long *tapesize)
 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++)
@@ -407,8 +407,8 @@ struct mapfile_context {
 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;
@@ -522,12 +522,12 @@ struct mapdirs_context {
 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;
@@ -606,7 +606,7 @@ static int
 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);
@@ -691,8 +691,8 @@ searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void
 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);
@@ -1130,7 +1130,7 @@ dmpindir(dump_ino_t ino, daddr_t blk, int ind_level, fsizeT *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);
@@ -1166,7 +1166,7 @@ blksout(daddr_t *blkp, int frags, dump_ino_t ino)
 void
 dumpmap(char *map, int type, dump_ino_t ino)
 {
-       register int i;
+       int i;
        char *cp;
 
        spcl.c_type = type;
@@ -1176,21 +1176,20 @@ dumpmap(char *map, int type, dump_ino_t ino)
                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) {
@@ -1199,7 +1198,18 @@ writeheader(dump_ino_t ino)
                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);
 }