From owner-dev-commits-src-main@freebsd.org Fri Dec 25 02:50:19 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1FA54B3C1F; Fri, 25 Dec 2020 02:50:19 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2BJC4B48z3w8g; Fri, 25 Dec 2020 02:50:19 +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 82A461B160; Fri, 25 Dec 2020 02:50:19 +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 0BP2oJtV076200; Fri, 25 Dec 2020 02:50:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BP2oJEe076195; Fri, 25 Dec 2020 02:50:19 GMT (envelope-from git) Date: Fri, 25 Dec 2020 02:50:19 GMT Message-Id: <202012250250.0BP2oJEe076195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 760dbe84abfb - Don't set more_data which is never used. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 760dbe84abfb0b3aa9b72f7474fb9a066bbdd0cf Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Dec 2020 02:50:19 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=760dbe84abfb0b3aa9b72f7474fb9a066bbdd0cf commit 760dbe84abfb0b3aa9b72f7474fb9a066bbdd0cf Author: Xin LI AuthorDate: 2020-12-25 02:49:12 +0000 Commit: Xin LI CommitDate: 2020-12-25 02:49:12 +0000 Don't set more_data which is never used. MFC after: 2 weeks --- usr.sbin/zonectl/zonectl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/zonectl/zonectl.c b/usr.sbin/zonectl/zonectl.c index 6ab38cbd9503..dac773974deb 100644 --- a/usr.sbin/zonectl/zonectl.c +++ b/usr.sbin/zonectl/zonectl.c @@ -226,7 +226,6 @@ zonectl_print_rz(struct disk_zone_report *report, zone_output_flags out_flags, uint64_t next_lba = 0; char tmpstr[80]; char word_sep; - int more_data = 0; uint32_t i; field_widths[ZONE_FW_START] = 11; @@ -237,10 +236,8 @@ zonectl_print_rz(struct disk_zone_report *report, zone_output_flags out_flags, field_widths[ZONE_FW_SEQ] = 14; field_widths[ZONE_FW_RESET] = 16; - if ((report->entries_available - report->entries_filled) > 0) { - more_data = 1; + if ((report->entries_available - report->entries_filled) > 0) status = ZONE_PRINT_MORE_DATA; - } if (out_flags == ZONE_OF_SCRIPT) word_sep = '_';