From nobody Fri Oct 08 23:31:59 2021 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 2A6D712D82B9; Fri, 8 Oct 2021 23:32:00 +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 4HR4GS0nLWz4cFs; Fri, 8 Oct 2021 23:32:00 +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 EF5DC1051E; Fri, 8 Oct 2021 23:31:59 +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 198NVxLx000665; Fri, 8 Oct 2021 23:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 198NVxru000664; Fri, 8 Oct 2021 23:31:59 GMT (envelope-from git) Date: Fri, 8 Oct 2021 23:31:59 GMT Message-Id: <202110082331.198NVxru000664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Devin Teske Subject: git: 1c64959bff17 - main - bsdconfig: Comments 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: dteske X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c64959bff1772da4c9cc7d86c56f3729189b88e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=1c64959bff1772da4c9cc7d86c56f3729189b88e commit 1c64959bff1772da4c9cc7d86c56f3729189b88e Author: Devin Teske AuthorDate: 2021-10-08 23:26:21 +0000 Commit: Devin Teske CommitDate: 2021-10-08 23:26:21 +0000 bsdconfig: Comments My current style is to copy C for "/* NOTREACHED */" instead of spelling out "Not reached". Make this one nominal change in this one file and the others later. While here, word-smith "Preload" into "Pre-load" as I believe that to be more grammatically correct in this instance. Also while here, fix a comment capitalization error. Lastly, bump copyright for above changes. --- usr.sbin/bsdconfig/bsdconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdconfig/bsdconfig b/usr.sbin/bsdconfig/bsdconfig index 2ecdb30bc5a9..f132c0370264 100755 --- a/usr.sbin/bsdconfig/bsdconfig +++ b/usr.sbin/bsdconfig/bsdconfig @@ -1,7 +1,7 @@ #!/bin/sh #- # Copyright (c) 2012 Ron McDowell -# Copyright (c) 2012-2014 Devin Teske +# Copyright (c) 2012-2021 Devin Teske # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -132,7 +132,7 @@ usage() # local x=$longest_cmd ncols=1 x=$(( $x + 8 )) # Accommodate leading tab character - x=$(( $x + 3 + $longest_cmd )) # Preload end of next column + x=$(( $x + 3 + $longest_cmd )) # Pre-load end of next column while [ $x -lt $max_width ]; do ncols=$(( $ncols + 1 )) x=$(( $x + 3 + $longest_cmd )) @@ -176,7 +176,7 @@ usage() "PROGRAM_NAME" "$pgm" \ "COMMAND_LIST" "$cmd_list" - # Never reached + # NOTREACHED } # dialog_menu_main @@ -365,7 +365,7 @@ if [ "$1" ]; then # case "$1" in -help|--help|-\?) usage - # Not reached + # NOTREACHED esac # @@ -375,16 +375,16 @@ if [ "$1" ]; then if ! { indexfile=$( f_index_file "$1" ) && cmd=$( f_index_menusel_command "$indexfile" "$1" ) }; then - # no matches, display usage (which shows valid keywords) + # No matches, display usage (which shows valid keywords) f_err "%s: %s: $msg_not_found\n" "$pgm" "$1" usage - # Not reached + # NOTREACHED fi f_dprintf "cmd=[%s] *=[%s]" "$cmd" "$*" shift exec $cmd ${USE_XDIALOG:+-X} "$@" || exit 1 - # Not reached + # NOTREACHED fi #