git: c16f699d79e2 - stable/13 - Whitespace and capitalization cleanups.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 04 Feb 2022 20:00:32 UTC
The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c16f699d79e2ae46f08e56b4d549d684867d8cd8 commit c16f699d79e2ae46f08e56b4d549d684867d8cd8 Author: Kirk McKusick <mckusick@FreeBSD.org> AuthorDate: 2022-01-06 00:32:12 +0000 Commit: Kirk McKusick <mckusick@FreeBSD.org> CommitDate: 2022-02-04 19:59:30 +0000 Whitespace and capitalization cleanups. (cherry picked from commit c82df0a0bf28725b974b1805740a754cfc3961e1) --- sbin/fsck_ffs/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 2c6c93dce5dc..e78e2d206499 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -314,8 +314,8 @@ checkfilesys(char *filesys) exit(0); exit(4); } else { - pfatal( - "UNEXPECTED INCONSISTENCY, CANNOT RUN FAST FSCK\n"); + pfatal("UNEXPECTED INCONSISTENCY, CANNOT RUN " + "FAST FSCK\n"); } } close(fsreadfd); @@ -329,13 +329,14 @@ checkfilesys(char *filesys) * if not found, clear bkgrdflag and proceed with normal fsck */ if (bkgrdflag) { + /* Get the mount point information of the file system */ if (mntp == NULL) { bkgrdflag = 0; pfatal("NOT MOUNTED, CANNOT RUN IN BACKGROUND\n"); } else if ((mntp->f_flags & MNT_SOFTDEP) == 0) { bkgrdflag = 0; - pfatal( - "NOT USING SOFT UPDATES, CANNOT RUN IN BACKGROUND\n"); + pfatal("NOT USING SOFT UPDATES, CANNOT RUN IN " + "BACKGROUND\n"); } else if ((mntp->f_flags & MNT_RDONLY) != 0) { bkgrdflag = 0; pfatal("MOUNTED READ-ONLY, CANNOT RUN IN BACKGROUND\n"); @@ -527,10 +528,10 @@ checkfilesys(char *filesys) */ if (duplist) { if (preen || usedsoftdep) - pfatal("INTERNAL ERROR: dups with %s%s%s", + pfatal("INTERNAL ERROR: DUPS WITH %s%s%s", preen ? "-p" : "", - (preen && usedsoftdep) ? " and " : "", - usedsoftdep ? "softupdates" : ""); + (preen && usedsoftdep) ? " AND " : "", + usedsoftdep ? "SOFTUPDATES" : ""); printf("** Phase 1b - Rescan For More DUPS\n"); pass1b(); IOstats("Pass1b");