From nobody Fri Feb 04 20:00:32 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 6BA6B19886E7; Fri, 4 Feb 2022 20:00:32 +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 4Jr5xX2Mw0z4Xhl; Fri, 4 Feb 2022 20:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644004832; 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=i7TY0z7C/lIaR9widUcZfG6KUokzdm68vSeyPqfHiAY=; b=WXPhcua2nlDbEiAYqXLkJyVSOqPL0WWrSquIIUsnzAwQ9u2I6M8+VCjJtNnAZSFrXUi9bL UsNw+kQuSvKj0ZZYMjRDYE+TS5N8sKXyFgcOJhADbwm1jw8SSnQ9sabGkCd5eO/NJEpaFI WUHimKYvRk5Aqz0iFCU5JYWqGtKNDwin2fc6x7fMUQX3Xq+vHrmJNCES/d3XWIvH6C75HY 6W1xINzgkEC9OinbRV5XtRvjjcpHg8CQxLMT5ZSllNy5nbAhr8wTGa1NkluXNc9/V/uRND TiD/lQ1vIFvIvVrp2CYtKn3av8AfVyj8LiR6GOopSew926YKafuo/6g6VPEKIQ== 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 3013811B34; Fri, 4 Feb 2022 20:00:32 +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 214K0Wx6001853; Fri, 4 Feb 2022 20:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214K0WlM001852; Fri, 4 Feb 2022 20:00:32 GMT (envelope-from git) Date: Fri, 4 Feb 2022 20:00:32 GMT Message-Id: <202202042000.214K0WlM001852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: c16f699d79e2 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c16f699d79e2ae46f08e56b4d549d684867d8cd8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644004832; 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=i7TY0z7C/lIaR9widUcZfG6KUokzdm68vSeyPqfHiAY=; b=LmKT+ZmW1LPBi64b+uX3B8IKQGYbD5LwO1qohxmhJOY7qIvEq2NrMc0irqsRm2uVPGWqML IkF2R2xYc83BL+dKdkeeDGf3a5qi07pzYeVc+LD+8GmQAqqIjXvazdcG2Z6lPBRrVM4nOW 9n5tR00w/Sv5ZhpeCepXNgkuNWhCa7/3XAIPy7j2dtcoCTjyzvQ/nW63LrjjGzDoNNyHFM 7+nS8GNCEt/rEJBuL5RwKH44FrfFda1ozhnt2PaCNNaI74FAG8SkhJecG9PjAFeWjgZjLZ m8oey/tALP6L+DhyE5OUwjk5zESrXlAcYzoE3H1aXDqnLbSL9e7r6pmwGOxnCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644004832; a=rsa-sha256; cv=none; b=Eww0Xrm84fAww0NCn8JuGvz54eXT2bK1cxa7f3WSn6TeeR42ijH58mclp3xhxQLYhSxXYf 6ft30js1n8vJnPb1GBjLmjeOYKX48t/r47zKw4mCzOQO6soq0ymRxmN/RUtF8qYDWGS6tc RnxHKyewu2HrorZd4qj/nRuIwo8Vh9mwds+pl8nnj2+SkGQbWJMkUoPvebyfwZsVwBZeRD iyUO/2FZlN7t98R5k3u7GK+AhOUEZ9LNeU8rGjaZkcNRfkMWDxgyqbpyN/yaQeqqTqpJDT 91rJsJtLS8cq7TIor25TOKPkeeD3fxIKgX4Qv7H7NNibBnlrBLgVQXn0Nns5fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c16f699d79e2ae46f08e56b4d549d684867d8cd8 commit c16f699d79e2ae46f08e56b4d549d684867d8cd8 Author: Kirk McKusick AuthorDate: 2022-01-06 00:32:12 +0000 Commit: Kirk McKusick 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");