The branch main has been updated by mckusick:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c82df0a0bf28725b974b1805740a754cfc3961e1

commit c82df0a0bf28725b974b1805740a754cfc3961e1
Author:     Kirk McKusick <mckus...@freebsd.org>
AuthorDate: 2022-01-06 00:32:12 +0000
Commit:     Kirk McKusick <mckus...@freebsd.org>
CommitDate: 2022-01-06 00:32:48 +0000

    Whitespace and capitalization cleanups.
    
    No changes intended.
    
    Sponsored by: Netflix
---
 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 90eb745ddabc..acf26d9fc558 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");
@@ -529,10 +530,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");

Reply via email to