From nobody Mon Jun 19 20:47:03 2023 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 4QlMJS1YRyz4fjvX; Mon, 19 Jun 2023 20:47:04 +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 4QlMJS0zRKz4R4p; Mon, 19 Jun 2023 20:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207624; 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=d3rCGwzoaUA4YwRkfs+SnrugGxnhr5iIalu49sEB3tY=; b=m9OfKoNkdCQp/6q2Z+k//jgOH4Ix10mrpaLhVCAdUKwHNSkfk6n8X8DkChVlfXGV1pZIOx m8e05VBwJqIc9jOCHZqDqnv2uK2Pv4UaFfcz5eCBRnEr1qcRh6+OM41MEdHfQjH+Na6Rm8 1G3WxRv+qCyCWr6PABQKEnC32nQLeMunpCX1I1IffrmrXN5rh7KcRC1DRWAb5tqFjAGYcJ GiWxNLrhFH30CrPbI/GKGX0CK38t3uRURxbetR06/UQAarLXIc2b9AAtjrZniVKQ8q04Rl WjI8aZpp1CYLhm/TR6KFpDCJ3NEy77pGts0aIicZbJth1snD+9jYqAMvzntVXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207624; 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=d3rCGwzoaUA4YwRkfs+SnrugGxnhr5iIalu49sEB3tY=; b=Ht8yssNjxoHHTwgw+GYC5C5Z7XdydEtK0U0xXPD5+nudI8mT8J2pPEbzflI+d+58StpZRY YOAzl/SCJVg00Vwoih9/ydCl0iPWrTxTJ2G03h7XzZZatmnyUEOoeWl/kwlqT+KbG5Sad8 CvC/bqmoxsssGb90h1EPfgrEkY11Tv1wmpIREe6oXfM3m3zuGT87E6zFX3O0qzy+aFX33C w4MOl7RDpofRTitTM/gIq17g3PoW4X5NjAST0yXuf8o40xz0uglqzmFuQoK542RrIrngMO ZNLwjtTTynIfqR5e5N6L+QCRIlFtUuUsr77KH5CRYszqVAZkZPQFVJTPMfdOeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207624; a=rsa-sha256; cv=none; b=aZANuX9n+mOERbjFme9mOlTEzuf4UwrhxILiU/sh0jHKE7is1qPNfCuUzVpZR6+KNhe6v0 2kScrJIZVRMuPL2wlkeeDeMxokcd3qlo6hBlrt3iy+gYadLkCIKnt6zO4ZoHob+eSuJ1f8 +LR4Y4yoKUl+/FyYEnoVqkXHSBms+HUComwjGNTh9OpGGIXHFypXdMUmLuAGNbzF9V9Exu MbJGKQ1eAQAY5T/tRiIFOU5pacNO2UubHhAxY1SBRgqz4bZtWcqmn2tDubrShWN3vlkKmu e7gC2LC3RqwklH27wbb8mgEp0VqfTOg9CqbrwcP5wvTY+Gz1nnVH8D39AqXX3w== 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 4QlMJR73fSzXBn; Mon, 19 Jun 2023 20:47:03 +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 35JKl3VM095680; Mon, 19 Jun 2023 20:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl3B1095679; Mon, 19 Jun 2023 20:47:03 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:03 GMT Message-Id: <202306192047.35JKl3B1095679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8259fc46ac37 - main - camcontrol: Label the unused command args 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8259fc46ac37e56eb819760b611be9564793dc00 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8259fc46ac37e56eb819760b611be9564793dc00 commit 8259fc46ac37e56eb819760b611be9564793dc00 Author: Warner Losh AuthorDate: 2023-06-19 20:42:48 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: Label the unused command args Remove CAM_ARG_FORMAT_{BLOCK,BLI,PHYS} since they are not used. Label all the unused CAM_ARG_ bits as unused in comments to make them stand out. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40520 --- sbin/camcontrol/camcontrol.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 55a6ba93c99b..49786dae9ffe 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -123,18 +123,21 @@ typedef enum { CAM_ARG_LUN = 0x00000010, CAM_ARG_EJECT = 0x00000020, CAM_ARG_UNIT = 0x00000040, - CAM_ARG_FORMAT_BLOCK = 0x00000080, - CAM_ARG_FORMAT_BFI = 0x00000100, - CAM_ARG_FORMAT_PHYS = 0x00000200, + /* unused 0x00000080 */ + /* unused 0x00000100 */ + /* unused 0x00000200 */ CAM_ARG_PLIST = 0x00000400, CAM_ARG_GLIST = 0x00000800, CAM_ARG_GET_SERIAL = 0x00001000, CAM_ARG_GET_STDINQ = 0x00002000, CAM_ARG_GET_XFERRATE = 0x00004000, CAM_ARG_INQ_MASK = 0x00007000, + /* unused 0x00008000 */ + /* unused 0x00010000 */ CAM_ARG_TIMEOUT = 0x00020000, CAM_ARG_CMD_IN = 0x00040000, CAM_ARG_CMD_OUT = 0x00080000, + /* unused 0x00100000 */ CAM_ARG_ERR_RECOVER = 0x00200000, CAM_ARG_RETRIES = 0x00400000, CAM_ARG_START_UNIT = 0x00800000, @@ -145,6 +148,7 @@ typedef enum { CAM_ARG_DEBUG_XPT = 0x10000000, CAM_ARG_DEBUG_PERIPH = 0x20000000, CAM_ARG_DEBUG_PROBE = 0x40000000, + /* unused 0x80000000 */ } cam_argmask; struct camcontrol_opts {