From nobody Mon May 02 14:10:13 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 4F5FD1AB9090; Mon, 2 May 2022 14:10:13 +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 4KsQ391fwfz3vkP; Mon, 2 May 2022 14:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651500613; 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=y9fI8IKNiULjY9GNGS3CmIuxLhrj49lCNl4kzUgcBOA=; b=npV6heu8WvtRzZPHhHcN+sjgNLp4kYb6iFD9BjyQnhQ07Wl5t0cqlzoZJPJOklxoIWo31u Q6chymiWuQrSEL4Fn8XuwMcEgTwym8uN2oQ29CqvqzDp02VPx28HYa689WBlG/Fmq/y6pO 3Xax1CNOOzVnMM24yVo38FXsRQcvFvM7J1I3y/8XIw7WGZKCab/AAHAJ7xO5ILLgbtXf4z qZuc+Qjr7F59i6wNu0Spmafep2qOr4zdindWN/tGmnERmKVrPrb0BC3OD5DvzvtRF0jMsG j64ZtqW2YdVPfXG/cxzkYyzzm4qiYsCK0dZwCHd1Orec7Hcm8DWfvHJT6TDGew== 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 18E822F75; Mon, 2 May 2022 14:10:13 +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 242EADd1040232; Mon, 2 May 2022 14:10:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242EADTi040226; Mon, 2 May 2022 14:10:13 GMT (envelope-from git) Date: Mon, 2 May 2022 14:10:13 GMT Message-Id: <202205021410.242EADTi040226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 85983255c15b - stable/13 - fwcontrol: eliminate set but not used warning 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 85983255c15b4748c6d62a967142b1f61c75806f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651500613; 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=y9fI8IKNiULjY9GNGS3CmIuxLhrj49lCNl4kzUgcBOA=; b=TIm9iekzeE7THFtUzzXVjn8AuNDFr/xT40ZnaVPKpcMHcxUeRFgY1MP/tIq6qQiIDX/kfj Hx6AH8nxFp2v7hZjgHvV+1LTUVEJpBeenqhW/lQYFbvtH8C67369NSuBvFqbDM9qFsx1bd cEToNsMWOYfKW61nMpsqddgwjOk4IykFVIXrrXDD4lisY7CQ2CBwHu751uJGwCxxkwfXgG dgN1STG908N7eOj+Pzv1kKixyTsJtMHV9oTWQDsTDwbsddCuaNQS3UPTWox5yGM5Db5bui TZTFiuPb1SKQe+aakpoOp/F6Bolu6yKtaSN3YB3qhHiRFRDw3moCbMI33uhhxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651500613; a=rsa-sha256; cv=none; b=x/Zj9NVH561ol/l+bBeN+TW+3TtZGBTzy36v6r9nyZXrmnr3a5FrwZRzWvNQxy60XNIrxk MbUweJO7Aq5mxo4w67I6W0Wo3AEds6jgkMtNJxPwM8MDe3x2kjaWYKhPzTPJA4BNhWHAW/ kgmnFiTl8JFtf8ZMZEK7Et3m6sO84eUMhovVfg3xNrVEgs06blEBzTa3JrDsi8S6WZhxmt 7XOZtC+v1iyzvgdBLIgaNjcvBpai3kUwwf9anGp/3ToVPe8iurogvI4NiKZH/GHhXb+MaE KKDW9YIWiP8hKVG/7Xdtros/zYwx/ppOShZIl+C4LJFNhWPodTcQ1aIfF3Q6VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=85983255c15b4748c6d62a967142b1f61c75806f commit 85983255c15b4748c6d62a967142b1f61c75806f Author: Ed Maste AuthorDate: 2022-02-27 19:04:09 +0000 Commit: Ed Maste CommitDate: 2022-05-02 14:09:29 +0000 fwcontrol: eliminate set but not used warning The variable was used in an #if 0 block; just move the variable definition and setting into the same block since Firewire is mainly of historical interest and is unlikely to see ongoing development in FreeBSD. Sponsored by: The FreeBSD Foundation (cherry picked from commit 2d015cffc73ab1ff0e8be9004ab89ecbc777af78) --- usr.sbin/fwcontrol/fwdv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c index 2baf1c43c803..11af749af468 100644 --- a/usr.sbin/fwcontrol/fwdv.c +++ b/usr.sbin/fwcontrol/fwdv.c @@ -262,7 +262,7 @@ dvsend(int d, const char *filename, char ich, int count) struct dvdbc *dv; struct fw_pkt *pkt; int len, tlen, header, fd, frames, packets, vec, offset, nhdr, i; - int system=-1, pad_acc, cycle_acc, cycle, f_cycle, f_frac; + int system=-1, pad_acc, cycle_acc, cycle, f_frac; struct iovec wbuf[TNBUF*2 + NEMPTY]; char *pbuf; u_int32_t iso_data, iso_empty, hdr[TNBUF + NEMPTY][3]; @@ -363,10 +363,11 @@ next: if (frames % frame_rate[system] == 0) fprintf(stderr, "\n"); fflush(stderr); - f_cycle = (cycle_acc / frame_cycle[system].d) & 0xf; f_frac = (cycle_acc % frame_cycle[system].d * CYCLE_FRAC) / frame_cycle[system].d; #if 0 + int f_cycle; + f_cycle = (cycle_acc / frame_cycle[system].d) & 0xf; ciph->fdf.dv.cyc = htons(f_cycle << 12 | f_frac); #else ciph->fdf.dv.cyc = htons(cycle << 12 | f_frac);