From nobody Mon Dec 20 11:42:48 2021 X-Original-To: dev-commits-src-main@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 26DC519022BD; Mon, 20 Dec 2021 11:42:49 +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 4JHd4S5qmbz4fQg; Mon, 20 Dec 2021 11:42:48 +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 A7CD115D19; Mon, 20 Dec 2021 11:42:48 +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 1BKBgmwY055162; Mon, 20 Dec 2021 11:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKBgm0q055161; Mon, 20 Dec 2021 11:42:48 GMT (envelope-from git) Date: Mon, 20 Dec 2021 11:42:48 GMT Message-Id: <202112201142.1BKBgm0q055161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 3861bafb68f6 - main - firewire(4): Fix "set but not used" warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3861bafb68f6c60e4688b844fb6a678e29095655 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640000568; 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=rhJFlyj/5QISLyO5icgZG6/UTe7X7Q25mxhfHhDtaVI=; b=B7XLmJE3s0GoaVrTmXOHnBK/YizvIouPORgVzrpxGcmyaQOeYURMtjtYZhDADUrgGaB7vv iJxbu6U9gGoROe0nHGk6VnHJbGFN08XuDvn6jY+FYsvZaKNjqqZ4UaXceSGUnK4fq9x9yP S2m6saQ4j79WcUMskRI0R2IUpsvvRjhXddBEAJY9iQTU0cmhU4oHqZ1JwVA5YnwpwXG5e4 yZ5Bjomk5DbiHoSbUaYzjMPbgON6+wYMFGwGUdwx0imWXtdIn1+o0IHtrzaQ8FXYzIyiLz U3T1G3dj91RF8isytkdbtrFlDLcYJSTe9fn55xaJT/LGX8/V4b1td0ahTM1M/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640000568; a=rsa-sha256; cv=none; b=yU5sD2bs9yuWuHoDdmIg3U6b0GYXHE7aVgZHU8zs3EBy1PXpReYKg3F4i8jQbGTM+CzVlE LAVixbjeurvfRwJEc0s8JdSnbnZe+0lsU8JGZF/Uyr1a4atnU1vw5Gd/CuX+Tf8ZDYGnMn 0Kjin87FJbkYGWkVfloqtzw9c27gzOvOGJS/MV0qnKMae0E55Ndez2wq72AFhKiF5qkMnC 5Pw8NJc8SHeYRH1lrgKhXEszXkVhHaHTbiJBZYpMTpENhNf9RcDAfEOUvocNC2JRAc8eUo 3E4uTEKaozT9+vqUIauf0md65rSFfKbBMZwc1upsIXuFqKSLr0nk/18yBW274w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=3861bafb68f6c60e4688b844fb6a678e29095655 commit 3861bafb68f6c60e4688b844fb6a678e29095655 Author: Edward Tomasz Napierala AuthorDate: 2021-12-18 15:10:45 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-12-20 11:24:21 +0000 firewire(4): Fix "set but not used" warnings Sponsored By: EPSRC --- sys/dev/firewire/firewire.c | 5 ++++- sys/dev/firewire/if_fwe.c | 4 ++++ sys/dev/firewire/sbp.c | 2 -- sys/dev/firewire/sbp_targ.c | 4 ---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index bf197406a767..45f3ac3cb79d 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -1907,8 +1907,9 @@ fw_rcv(struct fw_rcv_buf *rb) struct fw_pkt *fp, *resfp; struct fw_bind *bind; int tcode; - int i, len, oldstate; + int oldstate; #if 0 + int i, len; { uint32_t *qld; int i; @@ -2035,9 +2036,11 @@ fw_rcv(struct fw_rcv_buf *rb) fw_xfer_free(rb->xfer); return; } +#if 0 len = 0; for (i = 0; i < rb->nvec; i++) len += rb->vec[i].iov_len; +#endif rb->xfer = STAILQ_FIRST(&bind->xferlist); if (rb->xfer == NULL) { device_printf(rb->fc->bdev, "%s: " diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c index 35d1a41fad6f..657fd6515fca 100644 --- a/sys/dev/firewire/if_fwe.c +++ b/sys/dev/firewire/if_fwe.c @@ -554,7 +554,9 @@ fwe_as_input(struct fw_xferq *xferq) struct fwe_softc *fwe; struct fw_bulkxfer *sxfer; struct fw_pkt *fp; +#if 0 u_char *c; +#endif fwe = (struct fwe_softc *)xferq->sc; ifp = fwe->eth_softc.ifp; @@ -583,7 +585,9 @@ fwe_as_input(struct fw_xferq *xferq) } m->m_data += HDR_LEN + ETHER_ALIGN; +#if 0 c = mtod(m, u_char *); +#endif m->m_len = m->m_pkthdr.len = fp->mode.stream.len - ETHER_ALIGN; m->m_pkthdr.rcvif = ifp; #if 0 diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c index a161713a94ad..877c39a901a6 100644 --- a/sys/dev/firewire/sbp.c +++ b/sys/dev/firewire/sbp.c @@ -935,7 +935,6 @@ static void sbp_mgm_callback(struct fw_xfer *xfer) { struct sbp_dev *sdev; - int resp; sdev = (struct sbp_dev *)xfer->sc; @@ -943,7 +942,6 @@ SBP_DEBUG(1) device_printf(sdev->target->sbp->fd.dev, "%s:%s\n", __func__, sdev->bustgtlun); END_DEBUG - resp = xfer->resp; SBP_LOCK(sdev->target->sbp); sbp_xfer_free(xfer); SBP_UNLOCK(sdev->target->sbp); diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c index f1b302528213..1832703818ff 100644 --- a/sys/dev/firewire/sbp_targ.c +++ b/sys/dev/firewire/sbp_targ.c @@ -1419,7 +1419,6 @@ sbp_targ_poll(struct cam_sim *sim) static void sbp_targ_cmd_handler(struct fw_xfer *xfer) { - struct fw_pkt *fp; uint32_t *orb; struct corb4 *orb4; struct orb_info *orbi; @@ -1441,7 +1440,6 @@ sbp_targ_cmd_handler(struct fw_xfer *xfer) fw_xfer_free(xfer); return; } - fp = &xfer->recv.hdr; atio = orbi->atio; @@ -1574,7 +1572,6 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer) { struct sbp_targ_lstate *lstate; struct sbp_targ_login *login; - struct fw_pkt *fp; uint32_t *orb; struct morb4 *orb4; struct orb_info *orbi; @@ -1594,7 +1591,6 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer) fw_xfer_free(xfer); return; } - fp = &xfer->recv.hdr; orb = orbi->orb; /* swap payload */