From 4ee11241cf62be7f9f88f19c81a6c2342a4eb3a1 Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Thu, 2 May 1996 03:23:29 +0000
Subject: Get rid of extraneous calls to pfail.

---
 ufs-fsck/pass1.c | 14 +-------------
 ufs-fsck/pass2.c |  8 --------
 ufs-fsck/pass5.c | 18 ------------------
 ufs-fsck/setup.c |  6 ------
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/ufs-fsck/pass1.c b/ufs-fsck/pass1.c
index 0b9a04cf..066f4649 100644
--- a/ufs-fsck/pass1.c
+++ b/ufs-fsck/pass1.c
@@ -78,8 +78,6 @@ pass1 ()
 		  pfail ("SKIPPING");
 		  return RET_STOP;
 		}
-	      else
-		pfix ("CONTINUING");
 	    }
 	}
 
@@ -106,8 +104,6 @@ pass1 ()
 			  pfail ("SKIPPING");
 			  return RET_STOP;
 			}
-		      else
-			pfix ("CONTINUING");
 		    }
 		  new = malloc (sizeof (struct dups));
 		  new->dup = bno;
@@ -194,8 +190,6 @@ pass1 ()
 		    clear_inode (number, dp);
 		    pfix ("CLEARED");
 		  }
-		else
-		  pfail (0);
 	      }
 	    inodestate[number] = UNALLOC;
 	  }
@@ -346,8 +340,6 @@ pass1 ()
 				dbwarn = 2;
 				pfix ("DEALLOCATED");
 			      }
-			    else
-			      pfail (0);
 			  }
 			else if (dbwarn == 2)
 			  dp->di_db[lbn] = 0;
@@ -373,8 +365,6 @@ pass1 ()
 				ibwarn = 2;
 				pfix ("DEALLOCATED");
 			      }
-			    else
-			      pfail (0);
 			  }
 			else if (ibwarn == 2)
 			  dp->di_ib[lbn] = 0;
@@ -429,15 +419,13 @@ pass1 ()
 	    else if (dp->di_blocks != nblocks)
 	      {
 		problem (0, "INCORRECT BLOCK COUNT I=%d (%ld should be %d)",
-		       number, dp->di_blocks, nblocks);
+			 number, dp->di_blocks, nblocks);
 		if (preen || reply ("CORRECT"))
 		  {
 		    dp->di_blocks = nblocks;
 		    write_inode (number, dp);
 		    pfix ("CORRECTED");
 		  }
-		else
-		  pfail (0);
 	      }
 
 	    num_files++;
diff --git a/ufs-fsck/pass2.c b/ufs-fsck/pass2.c
index 426ba2b3..3c70170e 100644
--- a/ufs-fsck/pass2.c
+++ b/ufs-fsck/pass2.c
@@ -186,8 +186,6 @@ pass2 ()
 			  mod = 1;
 			  pfix ("REMOVED");
 			}
-		      else
-			pfail (0);
 		    }
 		  else
 		    targetdir->i_parent = dnp->i_number;
@@ -281,8 +279,6 @@ pass2 ()
 	      write_inode (dnp->i_number, &dino);
 	      pfix ("ADJUSTED");
 	    }
-	  else
-	    pfail (0);
 	}
       bzero (&dino, sizeof (struct dinode));
       dino.di_size = dnp->i_isize;
@@ -341,8 +337,6 @@ pass2 ()
 	      else
 		pfail (0);
 	    }
-	  else
-	    pfail (0);
 	}
       
       /* Check `.' to make sure it exists and is correct */
@@ -376,8 +370,6 @@ pass2 ()
 	      else
 		pfail (0);
 	    }
-	  else
-	    pfail (0);
 	}
     }
 }  
diff --git a/ufs-fsck/pass5.c b/ufs-fsck/pass5.c
index 2ec68b68..7ea7aeed 100644
--- a/ufs-fsck/pass5.c
+++ b/ufs-fsck/pass5.c
@@ -207,8 +207,6 @@ pass5 ()
 	      writecg = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
       if (newcg->cg_frotor > newcg->cg_ndblk)
 	{
@@ -220,8 +218,6 @@ pass5 ()
 	      writecg = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
       if (newcg->cg_irotor > newcg->cg_niblk)
 	{
@@ -233,8 +229,6 @@ pass5 ()
 	      writecg = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
       
       /* Zero the block maps and summary areas */
@@ -368,8 +362,6 @@ pass5 ()
 	      writecsum = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
       
       /* Check inode and block maps */
@@ -382,8 +374,6 @@ pass5 ()
 	      writecg = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
       
       if (bcmp (&cg_blktot(newcg)[0], &cg_blktot(cg)[0], sumsize))
@@ -395,8 +385,6 @@ pass5 ()
 	      writecg = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
       
       if (bcmp (newcg, cg, basesize))
@@ -408,8 +396,6 @@ pass5 ()
 	      writecg = 1;
 	      pfix ("FIXED");
 	    }
-	  else
-	    pfail (0);
 	}
 
       if (writecg)
@@ -432,8 +418,6 @@ pass5 ()
 	  writesb = 1;
 	  pfix ("FIXED");
 	}
-      else
-	pfail (0);
     }
 
   if (sblock->fs_clean == 0 && !fix_denied)
@@ -445,8 +429,6 @@ pass5 ()
 	  writesb = 1;
 	  pfix ("MARKED CLEAN");
 	}
-      else
-	pfail ("LEFT UNCLEAN");
     }
   
   if (writesb)
diff --git a/ufs-fsck/setup.c b/ufs-fsck/setup.c
index c0f047a2..d40cf70b 100644
--- a/ufs-fsck/setup.c
+++ b/ufs-fsck/setup.c
@@ -139,8 +139,6 @@ setup (char *dev)
 	  changedsb = 1;
 	  pfix ("SET TO DEFAULT");
 	}
-      else
-	pfail (0);
     }
   if (sblock->fs_interleave < 1
       || sblock->fs_interleave > sblock->fs_nsect)
@@ -153,8 +151,6 @@ setup (char *dev)
 	  changedsb = 1;
 	  pfix ("SET TO DEFAULT");
 	}
-      else
-	pfail (0);
     }
   if (sblock->fs_npsect < sblock->fs_nsect
       || sblock->fs_npsect > sblock->fs_nsect * 2)
@@ -166,8 +162,6 @@ setup (char *dev)
 	  changedsb = 1;
 	  pfix ("SET TO DEFAULT");
 	}
-      else
-	pfail (0);
     }
   if (sblock->fs_inodefmt >= FS_44INODEFMT)
     newinofmt = 1;
-- 
cgit v1.2.3