summaryrefslogtreecommitdiffstats
path: root/sbin/dump
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/dump')
-rw-r--r--sbin/dump/dump.h2
-rw-r--r--sbin/dump/main.c4
-rw-r--r--sbin/dump/optr.c4
-rw-r--r--sbin/dump/tape.c46
-rw-r--r--sbin/dump/traverse.c4
5 files changed, 30 insertions, 30 deletions
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 9060b00..f74e83f 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -108,7 +108,7 @@ int mapdirs __P((ino_t maxino, long *tapesize));
/* file dumping routines */
void blksout __P((daddr_t *blkp, int frags, ino_t ino));
-void bread __P((daddr_t blkno, char *buf, int size));
+void bread __P((daddr_t blkno, char *buf, int size));
void dumpino __P((struct dinode *dp, ino_t ino));
void dumpmap __P((char *map, int type, ino_t ino));
void writeheader __P((ino_t ino));
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index db7c41c..8c71021 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -93,7 +93,7 @@ main(argc, argv)
char **argv;
{
register ino_t ino;
- register int dirty;
+ register int dirty;
register struct dinode *dp;
register struct fstab *dt;
register char *map;
@@ -359,7 +359,7 @@ main(argc, argv)
the end of each block written, and not in mid-block.
Assume no erroneous blocks; this can be compensated
for with an artificially low tape size. */
- fetapes =
+ fetapes =
( tapesize /* blocks */
* TP_BSIZE /* bytes/block */
* (1.0/density) /* 0.1" / byte */
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 6db0908..303b5b3 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -171,7 +171,7 @@ struct group *gp;
/*
* Get the names from the group entry "operator" to notify.
- */
+ */
void
set_operators()
{
@@ -300,7 +300,7 @@ timeest()
if (tnow >= tschedule) {
tschedule = tnow + 300;
if (blockswritten < 500)
- return;
+ return;
deltat = tstart_writing - tnow +
(1.0 * (tnow - tstart_writing))
/ blockswritten * tapesize;
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index f6a4e5b..a7ceba5 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -318,12 +318,12 @@ trewind()
for (f = 0; f < SLAVES; f++) {
/*
- * Drain the results, but unlike EOT we DO (or should) care
- * what the return values were, since if we detect EOT after
- * we think we've written the last blocks to the tape anyway,
+ * Drain the results, but unlike EOT we DO (or should) care
+ * what the return values were, since if we detect EOT after
+ * we think we've written the last blocks to the tape anyway,
* we have to replay those blocks with rollforward.
*
- * fixme: punt for now.
+ * fixme: punt for now.
*/
if (slaves[f].sent) {
if (atomic(read, slaves[f].fd, (char *)&got, sizeof got)
@@ -391,9 +391,9 @@ rollforward()
ntb = (union u_spcl *)tslp->tblock[1];
/*
- * Each of the N slaves should have requests that need to
- * be replayed on the next tape. Use the extra slave buffers
- * (slaves[SLAVES]) to construct request lists to be sent to
+ * Each of the N slaves should have requests that need to
+ * be replayed on the next tape. Use the extra slave buffers
+ * (slaves[SLAVES]) to construct request lists to be sent to
* each slave in turn.
*/
for (i = 0; i < SLAVES; i++) {
@@ -401,7 +401,7 @@ rollforward()
otb = (union u_spcl *)slp->tblock;
/*
- * For each request in the current slave, copy it to tslp.
+ * For each request in the current slave, copy it to tslp.
*/
prev = NULL;
@@ -445,8 +445,8 @@ rollforward()
if (prev->dblk != 0) {
/*
- * If the last one was a disk block, make the
- * first of this one be the last bit of that disk
+ * If the last one was a disk block, make the
+ * first of this one be the last bit of that disk
* block...
*/
q->dblk = prev->dblk +
@@ -454,7 +454,7 @@ rollforward()
ntb = (union u_spcl *)tslp->tblock;
} else {
/*
- * It wasn't a disk block. Copy the data to its
+ * It wasn't a disk block. Copy the data to its
* new location in the buffer.
*/
q->dblk = 0;
@@ -548,7 +548,7 @@ restore_check_point:
case X_FINOK:
msg("Child %d finishes X_FINOK\n", childpid);
break;
- case X_ABORT:
+ case X_ABORT:
msg("Child %d finishes X_ABORT\n", childpid);
break;
case X_REWRITE:
@@ -598,7 +598,7 @@ restore_check_point:
while ((tapefd = (host ? rmtopen(tape, 2) :
pipeout ? 1 : open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
#else
- while ((tapefd = (pipeout ? 1 :
+ while ((tapefd = (pipeout ? 1 :
open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
#endif
{
@@ -613,7 +613,7 @@ restore_check_point:
blocksthisvol = 0;
if (top)
newtape++; /* new tape signal */
- spcl.c_count = slp->count;
+ spcl.c_count = slp->count;
/*
* measure firstrec in TP_BSIZE units since restore doesn't
* know the correct ntrec value...
@@ -707,13 +707,13 @@ enslave()
Exit(X_FINOK);
}
}
-
+
for (i = 0; i < SLAVES; i++)
- (void) atomic(write, slaves[i].fd,
- (char *) &slaves[(i + 1) % SLAVES].pid,
+ (void) atomic(write, slaves[i].fd,
+ (char *) &slaves[(i + 1) % SLAVES].pid,
sizeof slaves[0].pid);
-
- master = 0;
+
+ master = 0;
}
void
@@ -769,7 +769,7 @@ doslave(cmd, slave_number)
p->count * TP_BSIZE);
} else {
if (p->count != 1 || atomic(read, cmd,
- (char *)slp->tblock[trecno],
+ (char *)slp->tblock[trecno],
TP_BSIZE) != TP_BSIZE)
quit("master/slave protocol botched.\n");
}
@@ -798,7 +798,7 @@ doslave(cmd, slave_number)
#ifdef WRITEDEBUG
printf("slave %d wrote %d\n", slave_number, wrote);
#endif
- if (wrote < 0)
+ if (wrote < 0)
break;
if (wrote == 0)
eot_count++;
@@ -806,7 +806,7 @@ doslave(cmd, slave_number)
}
#ifdef WRITEDEBUG
- if (size != writesize)
+ if (size != writesize)
printf("slave %d only wrote %d out of %d bytes and gave up.\n",
slave_number, size, writesize);
#endif
@@ -828,7 +828,7 @@ doslave(cmd, slave_number)
* (for EOT handling)
*/
(void) atomic(write, cmd, (char *)&size, sizeof size);
- }
+ }
/*
* If partial write, don't want next slave to go.
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index ce70050..29034e6 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -545,14 +545,14 @@ getino(inum)
* Error recovery is attempted at most BREADEMAX times before seeking
* consent from the operator to continue.
*/
-int breaderrors = 0;
+int breaderrors = 0;
#define BREADEMAX 32
void
bread(blkno, buf, size)
daddr_t blkno;
char *buf;
- int size;
+ int size;
{
int cnt, i;
extern int errno;
OpenPOWER on IntegriCloud