From nobody Mon Jun 19 20:56:40 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 4QlMWX3zSnz4g01P; Mon, 19 Jun 2023 20:56:40 +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 4QlMWX3Z5hz4Yn3; Mon, 19 Jun 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687208200; 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=gfgZNIX0A2f49X94LlKA2VVhFmXskQ/EYvc4jSYIi1c=; b=pyhs6sBGfr2+853KAh1axO6OiP1OQEo8JPZnRb/ggk2vJKNpVhgY8Enk2ZeMO+VxwvJmJ5 lSak9A6TX+OI8ruiolifEtNZZQGdy4PCAvDzPvd3hVeSGJIzC8kwsaAj7LFSIkUM4a8R+d gQWJrSeTT7kxbRifJNDvT+YY20oeKPtDQ4pPw0l1Z0kxXhMUm6s01DjcbY94puFoLFd8by 7jz0hYv8123c2b3MTkRh5brYyyiOw2Xs9jXSc2EXP27z+vPjJw5506QJcKwr14wgxcDVlp 06ZNXOShAvf9bNJkgyu6VCJFSJibRMPShPy6CWhmYnwg6YKXo98DW5KVOP8bDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687208200; 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=gfgZNIX0A2f49X94LlKA2VVhFmXskQ/EYvc4jSYIi1c=; b=hD6RucjUISlK8I8u5U8RYJ86ZO0l8VZpfWTZF6bgsGVuCshY1s+hcPD3zkN08MRF0Nyl/y fXzq4+eKsBxeeS5qSlKkkeVqykm/5qucKkog0c8rnZpwOhRjWzHSambV5Ro3lQqSV49a94 75cvV70YkGtTK6G5GG9Wd3JZBVFqVoaVHppYCuTfL5NbcBGUk+rPh7zPOLPJ5bxPY+RrWq 03NShbARMMAbpd9lNv+hGjR7jGQCdlOTbv19KiJZt46CYgGFk8i1dPy/ce+XteUvnuOnb2 jgKpGU/V7mvmwkb9SGgwmJL269nqKUgm1CIEv0qN5TIHKF31GYidYVm/QpBKJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687208200; a=rsa-sha256; cv=none; b=qCDfRAi17VIiwJKq9893v9Yuh9KGPogC0p5wNcp0AMl4WbNxb8esaOCJBOoWKw+Hd20RDA kHA44sw2OljpAdtBPBKpI/V1x1XPjU3SHAX3/4sgwHIhNNyqPV4yhQpTbd/hty16feb0Hj /bGgk5sFAI+TmZDdm/a+tlKXIke8pWLxYa1Dyj5mk0IwRhUUhfmngQEqPZGcNV9mplX0sl K30Iy+cwXSirIe5FMtz5kpfQAQKIWEygH+fMM5mfSFCRfdFdIZ0I//tlj2Z/Zip2ySVFzh NRWThvItHM85He9oDGmnTy+7VW0TxTIaPRaNiZMnDk3Y4Vd12E3J3P+PliKToQ== 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 4QlMWX2fwqzXck; Mon, 19 Jun 2023 20:56:40 +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 35JKue6i011722; Mon, 19 Jun 2023 20:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKue79011721; Mon, 19 Jun 2023 20:56:40 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:56:40 GMT Message-Id: <202306192056.35JKue79011721@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: 90f05f684077 - main - camcontrol: Zone fix two warnings 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: 90f05f68407735531108b45eb105f8088bbaa1a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90f05f68407735531108b45eb105f8088bbaa1a5 commit 90f05f68407735531108b45eb105f8088bbaa1a5 Author: Warner Losh AuthorDate: 2023-06-19 20:51:07 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:51:07 +0000 camcontrol: Zone fix two warnings Remove a set but never used variable, and use the protocol variable for its intended purpose. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40528 --- sbin/camcontrol/zone.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sbin/camcontrol/zone.c b/sbin/camcontrol/zone.c index 3f7dfcec4f35..fed94cd967e1 100644 --- a/sbin/camcontrol/zone.c +++ b/sbin/camcontrol/zone.c @@ -138,7 +138,6 @@ zone_rz_print(uint8_t *data_ptr, uint32_t valid_len, int ata_format, struct scsi_report_zones_desc *desc = NULL; uint32_t hdr_len, len; uint64_t max_lba, next_lba = 0; - int more_data = 0; zone_print_status status = ZONE_PRINT_OK; char tmpstr[80]; int field_widths[ZONE_NUM_FIELDS]; @@ -168,7 +167,6 @@ zone_rz_print(uint8_t *data_ptr, uint32_t valid_len, int ata_format, } if (hdr_len > (valid_len + sizeof(*hdr))) { - more_data = 1; status = ZONE_PRINT_MORE_DATA; } @@ -592,7 +590,7 @@ restart_report: /*retry_count*/ retry_count, /*flags*/ CAM_DIR_NONE | CAM_DEV_QFRZDIS, /*tag_action*/ task_attr, - /*protocol*/ AP_PROTO_NON_DATA, + /*protocol*/ protocol, /*ata_flags*/ AP_FLAG_BYT_BLOK_BYTES | AP_FLAG_TLEN_NO_DATA, /*features*/ features,