From nobody Wed Apr 6 23:46:20 2022 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 9C4391A84083; Wed, 6 Apr 2022 23:46:21 +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 4KYh3w6NCTz4R4F; Wed, 6 Apr 2022 23:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288781; 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=MuBgv34/Tgp65gZc2q2/sD57JxEgfVB2shqn8kZmGFk=; b=HOtxMdcoySBjHxHykAaq6F2ycxRkBNNKrxX6nYCTTkHDNpAtWwGY+3k6Gxj0VxluR9idYX f5tclduOVA5ELiChxiX5F3Fs6gCNp/nVlzF54CXqj/SeQOA58eNwttyFeWE9GoO7JbV0f1 dR2JFBVULQHW3Ja3vyLHkSRGnUp7HLB4aP0d7DW9WPw6jN2rHFb7+S4Hhp7yz0s5kkRGX6 VVhtdh64dmidqfFWVJmHhKn2P+u+9Wzoajo4BZg6to6Jhw/mz7mxoC71VLTAEJkAp+/xs8 vbSZE8YnP9q4VKDVx5j0+g8NkFFal4iY6pFJCc+JtKYockC9/dnheIyC/8s4gQ== 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 2FEB624DF5; Wed, 6 Apr 2022 23:46:20 +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 236NkKOr009095; Wed, 6 Apr 2022 23:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236NkKSU009094; Wed, 6 Apr 2022 23:46:20 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:46:20 GMT Message-Id: <202204062346.236NkKSU009094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 551feba18cf3 - main - sc vga: Remove unused variables. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 551feba18cf3f409020ad33c611687cd55f0b958 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288781; 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=MuBgv34/Tgp65gZc2q2/sD57JxEgfVB2shqn8kZmGFk=; b=rYBcJiDJnJYcN82aH78891QMUqK4Od9wHtP7/uHBtGug2B39qjBp4jGDzjwdhmdMXyk2fu KJHE0xnoVEoxC5h+tGjmOz6ASYKxF9RX2qxheyfZF8imZyk8zIbgCgR0LZ/uYhJ4KDEEVM WhkbrWnizSPB3mcNT6jEUWA53Z0Cg9mVtNjzCizRgt7vHsrEX7Y8h9WKU8cd5XDw9oMba6 ApFaAMnJP++PVe64v0sMMS/IJzj65SuZGllqfIxa9Q4p4JrP77As1S/JHWAm1ZmoBRe1DC p4s2bAcgh9IADczc8oyXVjl0zyBG+o9OotH/pImzNYif4ohGVZ+9lsy+IlieRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649288781; a=rsa-sha256; cv=none; b=wd/Ekk+EU3UIbKpx6vySveDdZoclXJswGTi+i67VjD1XwoGttbVGjo3rff7urpcrclca1v Yhd4ii7z1mNru29v+1LTm++4KackaYAwEoEJk9XvpMyUGdzJJT8jwCo1pSnzb11dbYmKPr tPUv8cz8kzRFGilu1rk71hCweSFbEk1EIzktMIV1vCGuXan7r9296t9ADL9rOFgmPi7lx5 da8fIeRzKFpgVHOdRmE4bV1BXs76MPrxUoSg9nc3wFTZJ/mhxzflD1ipriqMG6BZsMYxC1 LxC/hs+fyir6fgQufMYY/tPdqEc6b0SZIkPSgRBIup7oDQRKh9w15YyaUJvXsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=551feba18cf3f409020ad33c611687cd55f0b958 commit 551feba18cf3f409020ad33c611687cd55f0b958 Author: John Baldwin AuthorDate: 2022-04-06 23:45:28 +0000 Commit: John Baldwin CommitDate: 2022-04-06 23:45:28 +0000 sc vga: Remove unused variables. Cast the return value of intentional dummy reads to void. --- sys/dev/syscons/scvgarndr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c index 990c12f8f89d..446a6313f419 100644 --- a/sys/dev/syscons/scvgarndr.c +++ b/sys/dev/syscons/scvgarndr.c @@ -942,7 +942,6 @@ vga_vgadraw_planar(scr_stat *scp, int from, int count, int flip) int line_width; int i, j; int a; - u_char c; line_width = scp->sc->adp->va_line_width; @@ -972,7 +971,7 @@ vga_vgadraw_planar(scr_stat *scp, int from, int count, int flip) if (scp->sc->adp->va_type != KD_VGA) outw(GDCIDX, 0xff08); /* bit mask */ writeb(d, 0xff); - c = readb(d); /* set bg color in the latch */ + (void)readb(d); /* set bg color in the latch */ } /* foreground color */ if (fg != col1) { @@ -1059,7 +1058,6 @@ draw_pxlcursor_planar(scr_stat *scp, int at, int on, int flip) int col; int a; int i; - u_char c; line_width = scp->sc->adp->va_line_width; @@ -1079,7 +1077,7 @@ draw_pxlcursor_planar(scr_stat *scp, int at, int on, int flip) outw(GDCIDX, col | 0x00); /* set/reset */ outw(GDCIDX, 0xff08); /* bit mask */ writeb(d, 0); - c = readb(d); /* set bg color in the latch */ + (void)readb(d); /* set bg color in the latch */ /* foreground color */ col = a & 0x0f00; outw(GDCIDX, col | 0x00); /* set/reset */ @@ -1186,7 +1184,7 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y) const struct mousedata *mdp; vm_offset_t p; int line_width; - int xoff, yoff; + int xoff; int ymax; uint32_t m; int i, j, k; @@ -1195,7 +1193,6 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y) mdp = scp->mouse_data; line_width = scp->sc->adp->va_line_width; xoff = (x - scp->xoff*8)%8; - yoff = y - rounddown(y, line_width); ymax = imin(y + mdp->md_height, scp->ypixel); if (scp->sc->adp->va_type == KD_VGA) {