From nobody Thu Jan 06 00:32:56 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 333081940EA5; Thu, 6 Jan 2022 00:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JTnPh6Stcz4ZmT; Thu, 6 Jan 2022 00:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDB0A16512; Thu, 6 Jan 2022 00:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2060Wuts071609; Thu, 6 Jan 2022 00:32:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2060Wuex071608; Thu, 6 Jan 2022 00:32:56 GMT (envelope-from git) Date: Thu, 6 Jan 2022 00:32:56 GMT Message-Id: <202201060032.2060Wuex071608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: c82df0a0bf28 - main - Whitespace and capitalization cleanups. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c82df0a0bf28725b974b1805740a754cfc3961e1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641429176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hw5ObiZ13/PPfXEzfkcPylrHTSpNlxZq6bB0bkhBTBA=; b=Cf6sLIjKJcUDLC2bId0/BnS0hdoMJ7CHDl/Fd9cLp2LQB1kBYpTi2CXKdXT89ehcxac4ir QB9oHgbcmjiFPLQTpfwX7DBfu9wKB+5yl3O7yERRve1QpgmNJaxOk4DjQf5NZGaafAgeLZ RT4e/h84tNUWuH/eWcFx4ruPiDoMRF6iM1B/vgKJWAWBciuv2u/tlk01tHUO84+jmA+LkG AIdWw0Sa2F8hjnwGD7RrVnarfYVP2hXDzC1iNHgPWlx9IoE8Ivau/os2AzqZ4GsCPpvMkK djmA4i4w8TORmVD25DtrJ7Dsq0l/SsLtNiy8Rt2SNLdMuUAaoz9y3nzrml9IUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641429176; a=rsa-sha256; cv=none; b=o88t04Nom+l3WOFdf0HUErsv2Ytz+keVnStD/pQEHIE76Uh5Yvr/qx2nSnmKpzfEBojymL hpLN6iZcTEoGHbtuUlOKFnFmk8YI745HX4ydtefpFLcE1gFfumlPrWuq1kfag7Fb1lk14B DIMRZB4Wcv20zwqMrqDO5IshPNoVG7dGMTwF9nYWzCVJdDYrvq/ivA8GEaV17Tn1RACvwP Etfeunsgtm9sYJpLKrCtDIICfgtSI/hn7EQsjf/el4/SSmxAbKuaNZfb/14GZluJusrvcI /7ahBamQGwzZbSN+NduIkqaHZvPYNA2ITjRUYmmkMauAsp5SV2RqCYv/RFMa3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c82df0a0bf28725b974b1805740a754cfc3961e1 commit c82df0a0bf28725b974b1805740a754cfc3961e1 Author: Kirk McKusick AuthorDate: 2022-01-06 00:32:12 +0000 Commit: Kirk McKusick 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");